Abstract classification aggregation

code/ActivityRecorder/src/uk/co/md87/android/activityrecorder/RecorderService.java

@@ -22,12 +22,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import uk.co.md87.android.activityrecorder.rpc.ActivityRecorderBinder;
 import uk.co.md87.android.activityrecorder.rpc.Classification;
+import uk.co.md87.android.common.Aggregator;
 
 /**
  *
@@ -35,47 +35,7 @@ import uk.co.md87.android.activityrecorder.rpc.Classification;
  */
 public class RecorderService extends Service {
 
-    static final double DELTA = 0.25;
-    static final double THRESHOLD = 0.5;
-
-    private final HashMap<String, HashMap<String, Double>> scores
-            = new HashMap<String, HashMap<String, Double>>() {{
-        put("", new HashMap<String, Double>() {{
-            put("null", 0.5d);
-            put("CLASSIFIED", 0.5d);
-        }});
-
-        put("CLASSIFIED", new HashMap<String, Double>() {{
-            put("null", 0.2d);
-            put("DANCING", 0.2d);
-            put("WALKING", 0.2d);
-            put("VEHICLE", 0.2d);
-            put("IDLE", 0.2d);
-        }});
-
-        put("CLASSIFIED/WALKING", new HashMap<String, Double>() {{
-            put("null", 0.5d);
-            put("STAIRS", 0.5d);
-        }});
-
-        put("CLASSIFIED/VEHICLE", new HashMap<String, Double>() {{
-            put("null", 0.333d);
-            put("CAR", 0.333d);
-            put("BUS", 0.333d);
-        }});
-
-        put("CLASSIFIED/IDLE", new HashMap<String, Double>() {{
-            put("null", 0.333d);
-            put("STANDING", 0.333d);
-            put("SITTING", 0.333d);
-        }});
-
-        put("CLASSIFIED/WALKING/STAIRS", new HashMap<String, Double>() {{
-            put("null", 0.333d);
-            put("UP", 0.333d);
-            put("DOWN", 0.333d);
-        }});
-    }};
+    private final Aggregator aggregator = new Aggregator();
 
     private final ActivityRecorderBinder.Stub binder = new ActivityRecorderBinder.Stub() {
 
@@ -230,26 +190,9 @@ public class RecorderService extends Service {
     }
 
     void updateScores(final String classification) {
-        String path = "";
+        aggregator.addClassification(classification);
 
-        for (String part : classification.split("/")) {
-            if (!scores.containsKey(path)) {
-                throw new RuntimeException("Path not found: " + path
-                        + " (classification: " + classification + ")");
-            }
-
-            updateScores(scores.get(path), part);
-            path = path + (path.length() == 0 ? "" : "/") + part;
-        }
-
-        if (scores.containsKey(path)) {
-            // This classification has children which we're not using
-            // e.g. we've received CLASSIFIED/WALKING, but we're not walking
-            //      up or down stairs
-            updateScores(scores.get(path), "null");
-        }
-
-        final String best = getClassification();
+        final String best = aggregator.getClassification();
 
         if (!classifications.isEmpty() && best.equals(classifications
                     .get(classifications.size() - 1).getClassification())) {
@@ -259,39 +202,6 @@ public class RecorderService extends Service {
         }
     }
 
-    String getClassification() {
-        String path = "";
-
-        do {
-            final Map<String, Double> map = scores.get(path);
-            double best = THRESHOLD;
-            String bestPath = "null";
-
-            for (Map.Entry<String, Double> entry : map.entrySet()) {
-                if (entry.getValue() >= best) {
-                    best = entry.getValue();
-                    bestPath = entry.getKey();
-                }
-            }
-
-            path = path + (path.length() == 0 ? "" : "/") + bestPath;
-        } while (scores.containsKey(path));
-
-        return path.replaceAll("(^CLASSIFIED)?/?null$", "");
-    }
-
-    void updateScores(final Map<String, Double> map, final String target) {
-        for (Map.Entry<String, Double> entry : map.entrySet()) {
-            //Log.d(getClass().getName(), "Score for " + entry.getKey() + " was: " + entry.getValue());
-            entry.setValue(entry.getValue() * (1 - DELTA));
-
-            if (entry.getKey().equals(target)) {
-                entry.setValue(entry.getValue() + DELTA);
-            }
-            //Log.d(getClass().getName(), "Score for " + entry.getKey() + " is now: " + entry.getValue());
-        }
-    }
-
     @Override
     public void onDestroy() {
         super.onDestroy();

code/Common/Aggregator.java

@@ -0,0 +1,113 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package uk.co.md87.android.common;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @author chris
+ */
+public class Aggregator {
+
+    static final double DELTA = 0.25;
+    static final double THRESHOLD = 0.5;
+
+    private final HashMap<String, HashMap<String, Double>> scores
+            = new HashMap<String, HashMap<String, Double>>() {{
+        put("", new HashMap<String, Double>() {{
+            put("null", 0.5d);
+            put("CLASSIFIED", 0.5d);
+        }});
+
+        put("CLASSIFIED", new HashMap<String, Double>() {{
+            put("null", 0.2d);
+            put("DANCING", 0.2d);
+            put("WALKING", 0.2d);
+            put("VEHICLE", 0.2d);
+            put("IDLE", 0.2d);
+        }});
+
+        put("CLASSIFIED/WALKING", new HashMap<String, Double>() {{
+            put("null", 0.5d);
+            put("STAIRS", 0.5d);
+        }});
+
+        put("CLASSIFIED/VEHICLE", new HashMap<String, Double>() {{
+            put("null", 0.333d);
+            put("CAR", 0.333d);
+            put("BUS", 0.333d);
+        }});
+
+        put("CLASSIFIED/IDLE", new HashMap<String, Double>() {{
+            put("null", 0.333d);
+            put("STANDING", 0.333d);
+            put("SITTING", 0.333d);
+        }});
+
+        put("CLASSIFIED/WALKING/STAIRS", new HashMap<String, Double>() {{
+            put("null", 0.333d);
+            put("UP", 0.333d);
+            put("DOWN", 0.333d);
+        }});
+    }};
+
+    public void addClassification(final String classification) {
+        String path = "";
+
+        for (String part : classification.split("/")) {
+            if (!scores.containsKey(path)) {
+                throw new RuntimeException("Path not found: " + path
+                        + " (classification: " + classification + ")");
+            }
+
+            updateScores(scores.get(path), part);
+            path = path + (path.length() == 0 ? "" : "/") + part;
+        }
+
+        if (scores.containsKey(path)) {
+            // This classification has children which we're not using
+            // e.g. we've received CLASSIFIED/WALKING, but we're not walking
+            //      up or down stairs
+            updateScores(scores.get(path), "null");
+        }
+    }
+
+    void updateScores(final Map<String, Double> map, final String target) {
+        for (Map.Entry<String, Double> entry : map.entrySet()) {
+            //Log.d(getClass().getName(), "Score for " + entry.getKey() + " was: " + entry.getValue());
+            entry.setValue(entry.getValue() * (1 - DELTA));
+
+            if (entry.getKey().equals(target)) {
+                entry.setValue(entry.getValue() + DELTA);
+            }
+            //Log.d(getClass().getName(), "Score for " + entry.getKey() + " is now: " + entry.getValue());
+        }
+    }
+
+    public String getClassification() {
+        String path = "";
+
+        do {
+            final Map<String, Double> map = scores.get(path);
+            double best = THRESHOLD;
+            String bestPath = "null";
+
+            for (Map.Entry<String, Double> entry : map.entrySet()) {
+                if (entry.getValue() >= best) {
+                    best = entry.getValue();
+                    bestPath = entry.getKey();
+                }
+            }
+
+            path = path + (path.length() == 0 ? "" : "/") + bestPath;
+        } while (scores.containsKey(path));
+
+        return path.replaceAll("(^CLASSIFIED)?/?null$", "");
+    }
+
+}