Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 4bfbf58

Browse files
committed
sort results by probability
1 parent 60dc717 commit 4bfbf58

File tree

1 file changed

+56
-7
lines changed

1 file changed

+56
-7
lines changed

‎src/classification/DistanceClassification.java

Lines changed: 56 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -172,27 +172,76 @@ private void testClassificationModel() {
172172

173173
}
174174
float min = Float.valueOf(this.predictedTestData[i][0][1]);
175+
175176
int tempIndex = 0;
176177
this.sortedProbability[i][0] = tempIndex;
177-
for (int j = 0; j <this.numberOfClasses; j++) {
178+
179+
for (int j = 0; j < this.numberOfClasses; j++) {
178180
if (min > Float.valueOf(this.predictedTestData[i][j][1])) {
179181
min = Float.valueOf(this.predictedTestData[i][j][1]);
180182
tempIndex = j;
181-
if (this.sortedProbability[i][0] != 0) {
182-
for (int k = this.numberOfClasses -1; k > 0; k--) {
183-
this.sortedProbability[i][k] = this.sortedProbability[i][k -1];
183+
}
184+
}
185+
this.sortedProbability[i][0] = tempIndex;
186+
for (int j = 1; j < this.numberOfClasses; j++) {
187+
tempIndex = 0;
188+
this.sortedProbability[i][j] = tempIndex;
189+
min = Float.valueOf(this.predictedTestData[i][this.sortedProbability[i][j-1]][1]);
190+
for (int k = 0; k < this.numberOfClasses; k++) {
191+
//System.out.println("Min: " + min);
192+
//System.out.print(k + " ");
193+
//System.out.println(this.predictedTestData[i][k][1]);
194+
//System.out.println( Float.valueOf(this.predictedTestData[i][this.sortedProbability[i][j-1]][1]));
195+
if ((min > Float.valueOf(this.predictedTestData[i][k][1]) &&
196+
Float.valueOf(this.predictedTestData[i][k][1]) > Float.valueOf(this.predictedTestData[i][this.sortedProbability[i][j-1]][1])) ||
197+
(Float.valueOf(this.predictedTestData[i][k][1]) > Float.valueOf(this.predictedTestData[i][this.sortedProbability[i][j-1]][1]) &&
198+
min == Float.valueOf(this.predictedTestData[i][this.sortedProbability[i][j-1]][1]))) {
199+
if (min > Float.valueOf(this.predictedTestData[i][k][1]) &&
200+
Float.valueOf(this.predictedTestData[i][k][1]) > Float.valueOf(this.predictedTestData[i][this.sortedProbability[i][j-1]][1])) {
201+
//System.out.println("First condition");
202+
}
203+
if (Float.valueOf(this.predictedTestData[i][k][1]) > Float.valueOf(this.predictedTestData[i][this.sortedProbability[i][j-1]][1]) &&
204+
k != this.sortedProbability[i][j-1]) {
205+
//System.out.println("Second condition");
184206
}
207+
min = Float.valueOf(this.predictedTestData[i][k][1]);
208+
//System.out.println("new Min: " + min);
209+
tempIndex = k;
185210
}
186-
this.sortedProbability[i][0] = j;
187211
}
212+
this.sortedProbability[i][j] = tempIndex;
213+
//System.out.println("Index " + tempIndex);
188214
}
189-
this.sortedProbability[i][0] = tempIndex;
215+
/*
216+
for (int k = 0; k <this.numberOfClasses; k++) {
217+
if (j == k) {
218+
continue;
219+
}
220+
if (min > Float.valueOf(this.predictedTestData[i][k][1])) {
221+
min = Float.valueOf(this.predictedTestData[i][k][1]);
222+
tempIndex = j;
223+
}
224+
this.sortedProbability[i][k] = j;
225+
226+
227+
228+
if (this.sortedProbability[i][0] != 0) {
229+
for (int l = this.numberOfClasses - 1; l > 0; l--) {
230+
this.sortedProbability[i][k] = this.sortedProbability[i][k - 1];
231+
}
232+
}
233+
234+
}
235+
}*/
236+
237+
238+
190239
System.out.println(this.sortedProbability[i][0]);
191240
System.out.println(this.sortedProbability[i][1]);
192241
System.out.println(this.sortedProbability[i][2]);
193242

194243

195-
if (i == 90) {
244+
if (i == 5) {
196245
break;
197246
}
198247

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /