@@ -172,27 +172,76 @@ private void testClassificationModel() {
172
172
173
173
}
174
174
float min = Float .valueOf (this .predictedTestData [i ][0 ][1 ]);
175
+
175
176
int tempIndex = 0 ;
176
177
this .sortedProbability [i ][0 ] = tempIndex ;
177
- for (int j = 0 ; j <this .numberOfClasses ; j ++) {
178
+
179
+ for (int j = 0 ; j < this .numberOfClasses ; j ++) {
178
180
if (min > Float .valueOf (this .predictedTestData [i ][j ][1 ])) {
179
181
min = Float .valueOf (this .predictedTestData [i ][j ][1 ]);
180
182
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");
184
206
}
207
+ min = Float .valueOf (this .predictedTestData [i ][k ][1 ]);
208
+ //System.out.println("new Min: " + min);
209
+ tempIndex = k ;
185
210
}
186
- this .sortedProbability [i ][0 ] = j ;
187
211
}
212
+ this .sortedProbability [i ][j ] = tempIndex ;
213
+ //System.out.println("Index " + tempIndex);
188
214
}
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
+
190
239
System .out .println (this .sortedProbability [i ][0 ]);
191
240
System .out .println (this .sortedProbability [i ][1 ]);
192
241
System .out .println (this .sortedProbability [i ][2 ]);
193
242
194
243
195
- if (i == 90 ) {
244
+ if (i == 5 ) {
196
245
break ;
197
246
}
198
247
0 commit comments