Add flurry analytics

Various changes to activity recorder algorithm

code/ActivityRecorder/AndroidManifest.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-     package="uk.co.md87.android.activityrecorder" android:versionCode="2" android:versionName="0.1.3">
+     package="uk.co.md87.android.activityrecorder" android:versionCode="4" android:versionName="0.2.1">
     <application android:label="Activity Recorder" android:icon="@drawable/icon">
          <activity android:name=".ActivityRecorderActivity" android:label="Activity Recorder">
             <intent-filter>

code/ActivityRecorder/build.xml

 
     <target depends="init,compile,-pre-jar,-dex,-package-res-and-assets,-package-res-no-assets,-package-dex,-build-without-signing,-post-jar" description="Build unsigned JAR." name="unsigned-jar"/>
 
+    <target name="-pre-jar">
+       <unzip src="lib/FlurryAgent.jar" dest="${build.classes.dir}" overwrite="true"/>
+    </target>
+
 </project>

code/ActivityRecorder/nbproject/project.properties

 dist.dir=dist
 dist.javadoc.dir=${dist.dir}/javadoc
 excludes=
+file.reference.FlurryAgent.jar=lib/FlurryAgent.jar
 gen.source.dir=${src.dir}
 includes=**
 intermediate.dex=${build.dir}/classes.dex
-javac.classpath=
+javac.classpath=\
+    ${file.reference.FlurryAgent.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

code/ActivityRecorder/res/values/strings.xml

 
     <string name="activity_unknown">Unknown</string>
     <string name="activity_walking">Walking</string>
+    <string name="activity_walking_stairs">Walking (stairs)</string>
     <string name="activity_walking_stairs_up">Walking (up stairs)</string>
     <string name="activity_walking_stairs_down">Walking (down stairs)</string>
     <string name="activity_dancing">Dancing</string>
+    <string name="activity_idle">Idle</string>
     <string name="activity_idle_standing">Standing still</string>
     <string name="activity_idle_sitting">Sitting down</string>
+    <string name="activity_vehicle">Travelling</string>
     <string name="activity_vehicle_bus">Travelling by bus</string>
     <string name="activity_vehicle_car">Travelling by car</string>
 </resources>

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

 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ListView;
+import com.flurry.android.FlurryAgent;
 import java.util.List;
 
 import uk.co.md87.android.activityrecorder.rpc.ActivityRecorderBinder;
         public void onClick(View arg0) {
             try {
                 if (service.isRunning()) {
+                    FlurryAgent.onEvent("recording_stop");
                     stopService(new Intent(ActivityRecorderActivity.this,
                             RecorderService.class));
                     unbindService(connection);
                     bindService(new Intent(ActivityRecorderActivity.this, RecorderService.class),
                             connection, BIND_AUTO_CREATE);
                 } else {
+                    FlurryAgent.onEvent("recording_start");
                     handler.removeCallbacks(updateRunnable);
                     ((Button) findViewById(R.id.togglebutton)).setEnabled(false);
 
         return ((TelephonyManager) getSystemService(TELEPHONY_SERVICE)).getDeviceId();
     }
 
+    /** {@inheritDoc} */
+    @Override
+    protected void onStart() {
+        super.onStart();
+
+        FlurryAgent.onStartSession(this, "EMKSQFUWSCW51AKBL2JJ");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        FlurryAgent.onEndSession(this);
+    }
+
 }

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

     public void onStart(Intent intent, int startId) {
         super.onStart(intent, startId);
 
-        Log.i(getClass().getName(), "Starting classifier");
+        //Log.i(getClass().getName(), "Starting classifier");
 
         data = intent.getFloatArrayExtra("data");
 
 
         classification = bestActivity;
 
-        Log.i(getClass().getName(), "Classification: " + classification);
+        //Log.i(getClass().getName(), "Classification: " + classification);
 
         bindService(new Intent(this, RecorderService.class), connection, BIND_AUTO_CREATE);
     }

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

         public static final int basic_model=0x7f040000;
     }
     public static final class string {
-        public static final int activity_dancing=0x7f050008;
-        public static final int activity_idle_sitting=0x7f05000a;
-        public static final int activity_idle_standing=0x7f050009;
+        public static final int activity_dancing=0x7f050009;
+        public static final int activity_idle=0x7f05000a;
+        public static final int activity_idle_sitting=0x7f05000c;
+        public static final int activity_idle_standing=0x7f05000b;
         public static final int activity_unknown=0x7f050004;
-        public static final int activity_vehicle_bus=0x7f05000b;
-        public static final int activity_vehicle_car=0x7f05000c;
+        public static final int activity_vehicle=0x7f05000d;
+        public static final int activity_vehicle_bus=0x7f05000e;
+        public static final int activity_vehicle_car=0x7f05000f;
         public static final int activity_walking=0x7f050005;
-        public static final int activity_walking_stairs_down=0x7f050007;
-        public static final int activity_walking_stairs_up=0x7f050006;
+        public static final int activity_walking_stairs=0x7f050006;
+        public static final int activity_walking_stairs_down=0x7f050008;
+        public static final int activity_walking_stairs_up=0x7f050007;
         public static final int app_name=0x7f050000;
         public static final int error_disconnected=0x7f050001;
         public static final int service_disabled=0x7f050003;

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

 import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
  */
 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 ActivityRecorderBinder.Stub binder = new ActivityRecorderBinder.Stub() {
 
         public void submitClassification(String classification) throws RemoteException {
-            Log.i(getClass().getName(), "Adding classification: " + classification);
+            //Log.i(getClass().getName(), "Received classification: " + classification);
 
-            if (!classifications.isEmpty() && classification.equals(classifications
-                    .get(classifications.size() - 1).getClassification())) {
-                classifications.get(classifications.size() - 1).updateEnd(System.currentTimeMillis());
-            } else {
-                classifications.add(new Classification(classification, System.currentTimeMillis()));
-            }
+            updateScores(classification);
         }
 
         public List<Classification> getClassifications() throws RemoteException {
     }
 
     public void sample() {
-        Log.i(getClass().getName(), "Sampling");
+        //Log.i(getClass().getName(), "Sampling");
         data[(nextSample * 2) % 256] = values[0];
         data[(nextSample * 2 + 1) % 256] = values[1];
         
             System.arraycopy(data, 0, cache, 0, 256);
             analyse(cache);
 
-            if (nextSample == 192) {
-                unregister();
-                return;
-            }
+            unregister();
+            return;
         }
 
         handler.postDelayed(sampleRunnable, 50);
     }
 
     public void analyse(float[] data) {
-        Log.i(getClass().getName(), "Analysing");
+        //Log.i(getClass().getName(), "Analysing");
         final Intent intent = new Intent(this, ClassifierService.class);
         intent.putExtra("data", data);
         startService(intent);
         manager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
         handler.postDelayed(registerRunnable, 1000);
 
+        classifications.add(new Classification("", System.currentTimeMillis()));
+
         wl.acquire();
     }
 
     void register() {
-        Log.i(getClass().getName(), "Registering");
+        //Log.i(getClass().getName(), "Registering");
         nextSample = 0;
         manager.registerListener(accelListener,
                 manager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER),
                 SensorManager.SENSOR_DELAY_FASTEST);
         handler.postDelayed(sampleRunnable, 50);
-        handler.postDelayed(registerRunnable, 60000);
+        handler.postDelayed(registerRunnable, 30000);
     }
 
     void unregister() {
         manager.unregisterListener(accelListener);
     }
 
+    void updateScores(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");
+        }
+
+        final String best = getClassification();
+
+        if (!classifications.isEmpty() && best.equals(classifications
+                    .get(classifications.size() - 1).getClassification())) {
+            classifications.get(classifications.size() - 1).updateEnd(System.currentTimeMillis());
+        } else {
+            classifications.add(new Classification(best, System.currentTimeMillis()));
+        }
+    }
+
+    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/ActivityRecorder/src/uk/co/md87/android/activityrecorder/rpc/Classification.java

         final int length = (int) ((end - start) / 1000);
 
         if (length < 60) {
-            duration = length + " secs";
+            duration = "<1 min";
         } else if (length < 60 * 60) {
             duration = (length / 60) + " mins";
         } else {
     }
 
     public Classification withContext(final Context context) {
-        String name = "activity_" + getClassification().substring(11)
-                .replace("/", "_").toLowerCase();
+        String name = "activity" + (getClassification().length() == 0
+                ? "_unknown" : getClassification().substring(10)
+                .replace("/", "_").toLowerCase());
 
         niceClassification = context.getResources().getText(
                 context.getResources().getIdentifier(name, "string",

code/SensorLogger/AndroidManifest.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-     package="uk.co.md87.android.sensorlogger" android:versionCode="16" android:versionName="0.2.3">
+     package="uk.co.md87.android.sensorlogger" android:versionCode="17" android:versionName="0.2.4">
     <application android:label="Sensor Logger" android:icon="@drawable/icon">
         <activity android:name=".activities.IntroActivity" android:label="Sensor Logger">
             <intent-filter>

code/SensorLogger/build.xml

 
     <target depends="init,compile,-pre-jar,-dex,-package-res-and-assets,-package-res-no-assets,-package-dex,-build-without-signing,-post-jar" description="Build unsigned JAR." name="unsigned-jar"/>
 
+    <target name="-pre-jar">
+       <unzip src="lib/FlurryAgent.jar" dest="${build.classes.dir}" overwrite="true"/>
+    </target>
 
 </project>

code/SensorLogger/nbproject/project.properties

 dist.dir=dist
 dist.javadoc.dir=${dist.dir}/javadoc
 excludes=
+file.reference.FlurryAgent.jar=lib/FlurryAgent.jar
 gen.source.dir=${src.dir}
 includes=**
 intermediate.dex=${build.dir}/classes.dex
-javac.classpath=
+javac.classpath=\
+    ${file.reference.FlurryAgent.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

code/SensorLogger/src/uk/co/md87/android/sensorlogger/activities/CountdownActivity.java

 import android.os.RemoteException;
 import android.util.Log;
 import android.widget.TextView;
+import com.flurry.android.FlurryAgent;
 import java.util.TimerTask;
 
 import uk.co.md87.android.sensorlogger.R;
             if (time > 0) {
                 handler.postDelayed(task, 500);
             } else {
+                FlurryAgent.onEvent("countdown_to_recording");
                 startActivity(new Intent(this, RecordingActivity.class));
                 finish();
             }
         }
     }
 
+    /** {@inheritDoc} */
+    @Override
+    protected void onStart() {
+        super.onStart();
+
+        FlurryAgent.onStartSession(this, "TFBJJPQUQX3S1Q6IUHA6");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        FlurryAgent.onEndSession(this);
+    }
+
 }

code/SensorLogger/src/uk/co/md87/android/sensorlogger/activities/IntroActivity.java

 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
+import com.flurry.android.FlurryAgent;
 import uk.co.md87.android.common.ExceptionHandler;
 
 import uk.co.md87.android.sensorlogger.R;
     @Override
     public void onClick(final View arg0) {
         try {
+            FlurryAgent.onEvent("intro_to_countdown");
+
             service.setState(2);
             startActivity(new Intent(this, CountdownActivity.class));
             finish();
         }
     }
 
+    /** {@inheritDoc} */
+    @Override
+    protected void onStart() {
+        super.onStart();
+        
+        FlurryAgent.onStartSession(this, "TFBJJPQUQX3S1Q6IUHA6");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        FlurryAgent.onEndSession(this);
+    }
+
 }

code/SensorLogger/src/uk/co/md87/android/sensorlogger/activities/RecordingActivity.java

 import android.os.RemoteException;
 import android.util.Log;
 import android.widget.TextView;
+import com.flurry.android.FlurryAgent;
 import java.util.TimerTask;
 
 import uk.co.md87.android.sensorlogger.R;
             }
 
             if (serviceState > 4) {
+                FlurryAgent.onEvent("countdown_to_results");
                 startActivity(new Intent(this, ResultsActivity.class));
                 finish();
             } else {
         }
     }
 
+    /** {@inheritDoc} */
+    @Override
+    protected void onStart() {
+        super.onStart();
+
+        FlurryAgent.onStartSession(this, "TFBJJPQUQX3S1Q6IUHA6");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        FlurryAgent.onEndSession(this);
+    }
+
 }

code/SensorLogger/src/uk/co/md87/android/sensorlogger/activities/ResultsActivity.java

 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.TextView;
+import com.flurry.android.FlurryAgent;
 import java.util.TimerTask;
 
 import uk.co.md87.android.sensorlogger.R;
     private final OnClickListener yesListener = new OnClickListener() {
 
         public void onClick(View arg0) {
+            FlurryAgent.onEvent("results_yes_click");
+
             findViewById(R.id.resultsno).setEnabled(false);
             findViewById(R.id.resultsyes).setEnabled(false);
 
             = new DialogInterface.OnClickListener() {
 
         public void onClick(DialogInterface arg0, int arg1) {
+            FlurryAgent.onEvent("results_correction_submitted");
+
             dialog = ProgressDialog.show(ResultsActivity.this, "Please wait",
                     "Submitting...", true);
             
     private final OnClickListener noListener = new OnClickListener() {
 
         public void onClick(View arg0) {
+            FlurryAgent.onEvent("results_no_click");
+
             findViewById(R.id.resultsno).setEnabled(false);
             findViewById(R.id.resultsyes).setEnabled(false);
 
     void checkStage() {
         try {
             if (service.getState() == 7) {
+                FlurryAgent.onEvent("results_to_thanks");
+
                 service.setState(8);
                 startActivity(new Intent(this, ThanksActivity.class));
                 finish();
         }
     }
 
+    /** {@inheritDoc} */
+    @Override
+    protected void onStart() {
+        super.onStart();
+
+        FlurryAgent.onStartSession(this, "TFBJJPQUQX3S1Q6IUHA6");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        FlurryAgent.onEndSession(this);
+    }
+
 }

code/SensorLogger/src/uk/co/md87/android/sensorlogger/activities/ThanksActivity.java

 import android.os.Bundle;
 import android.telephony.TelephonyManager;
 import android.widget.TextView;
+import com.flurry.android.FlurryAgent;
 
 import uk.co.md87.android.sensorlogger.R;
 
         return builder.toString();
     }
 
+    /** {@inheritDoc} */
+    @Override
+    protected void onStart() {
+        super.onStart();
+
+        FlurryAgent.onStartSession(this, "TFBJJPQUQX3S1Q6IUHA6");
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        FlurryAgent.onEndSession(this);
+    }
+
 }

website/index.html

        </p>
        <h4>Changelog</h4>
        <ul>
+        <li><strong>0.2.3 &rarr; 0.2.4</strong>: Added analytics</li>
         <li><strong>0.2.2 &rarr; 0.2.3</strong>: Fix another force close, updated model for classification</li>
         <li><strong>0.2.1 &rarr; 0.2.2</strong>: Fix force close, add reporting of exceptions</li>
         <li><strong>0.2.0 &rarr; 0.2.1</strong>: Bug fix related to turning display off</li>
         integrated, and the service will eventually provide an API for other
         applications to listen out for changes in the user's activity.
        </p>
+       <p>
+        The classification algorithm now uses scores assigned to each possible
+        classification instead of merely using the results from the last
+        set of sensor input. This means that the classifications may be
+        slightly delayed (it will take a minute or so to react to changes in
+        activity), but it makes the algorithm much more tolerant of occasional
+        erroneous readings.
+       </p>
        <h4>Changelog</h4>
        <ul>
+        <li><strong>0.2.0 &rarr; 0.2.1</strong>: Added analytics</li>
+        <li><strong>0.1.3 &rarr; 0.2.0</strong>: Changed classification algorithm to favour existing classifications, change recording to one sample every 30 seconds instead of 2 overlapping samples every 60 seconds, disable logging, durations measured in seconds now show as "&lt;1 min"</li>
         <li><strong>0.1.2 &rarr; 0.1.3</strong>: More efficient updating of activity list, give feedback when starting service</li>
         <li><strong>0.1.1 &rarr; 0.1.2</strong>: Fix various issues when starting service</li>
         <li><strong>0.1.0 &rarr; 0.1.1</strong>: Fix exception when stopping service in some conditions</li>