Another model update

code/Extractor/src/uk/co/md87/dsp/extractor/Classifier.java

@@ -42,11 +42,11 @@ public class Classifier {
         }
     }
 
-    public String classify(final Window window) {
+    public String[] classify(final Window window) {
         final Float[] target = window.getFeatures(features).values().toArray(
                 new Float[features.size()]);
         float best = Float.MAX_VALUE;
-        String bestActivity = "UNCLASSIFIED/UNKNOWN";
+        String bestActivity = "UNCLASSIFIED/UNKNOWN", secondBest = bestActivity;
 
         for (Map.Entry<Float[], String> entry : model.entrySet()) {
             float distance = 0;
@@ -57,11 +57,12 @@ public class Classifier {
 
             if (distance < best) {
                 best = distance;
+                secondBest = bestActivity;
                 bestActivity = entry.getValue();
             }
         }
 
-        return bestActivity;
+        return new String[]{bestActivity,secondBest};
     }
 
 }

code/Extractor/src/uk/co/md87/dsp/extractor/test/TrainingDataClassifier.java

@@ -79,15 +79,18 @@ public class TrainingDataClassifier {
 
                 for (Window window : new Windower(dataset).getWindows()) {
                     if (j++ % 3 != 0) {
-                        continue;
+                        //continue;
                     }
 
-                    String bestActivity = c.classify(window);
+                    String[] bestActivities = c.classify(window);
+                    String bestActivity = bestActivities[0];
 
                     if (bestActivity.equals(activity)) {
                         right++;
                     } else {
-                        System.out.println("Wrong: " + activity + " classified as " + bestActivity);
+                        System.out.println("Wrong: " + activity
+                                + " classified as " + bestActivity
+                                + "; 2nd best: " + bestActivities[1]);
                         wrong++;
                     }
                 }