Abstract accelerometer sampling behaviour

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

@@ -38,6 +38,7 @@ import uk.co.md87.android.common.Aggregator;
 import uk.co.md87.android.common.ModelReader;
 import uk.co.md87.android.common.accel.AccelReader;
 import uk.co.md87.android.common.accel.AccelReaderFactory;
+import uk.co.md87.android.common.accel.Sampler;
 
 /**
  *
@@ -63,60 +64,36 @@ public class RecorderService extends Service {
 
     };
 
-    private final Runnable sampleRunnable = new Runnable() {
+    private final Runnable registerRunnable = new Runnable() {
 
         public void run() {
-            final float[] values = reader.getSample();
-
-            data[nextSample * 2] = values[0];
-            data[nextSample * 2 + 1] = values[1];
-
-            if (++nextSample == 128) {
-                float[] cache = new float[256];
-                System.arraycopy(data, 0, cache, 0, 256);
-                analyse(cache);
-
-                reader.stopSampling();
-                return;
-            }
-
-            handler.postDelayed(sampleRunnable, 50);
+            //Log.i(getClass().getName(), "Registering");
+            sampler.start();
+            
+            handler.postDelayed(registerRunnable, 30000);
         }
-        
+
     };
 
-    private final Runnable registerRunnable = new Runnable() {
+    private final Runnable analyseRunnable = new Runnable() {
 
         public void run() {
-            //Log.i(getClass().getName(), "Registering");
-            nextSample = 0;
-
-            reader.startSampling();
-
-            handler.postDelayed(sampleRunnable, 50);
-            handler.postDelayed(registerRunnable, 30000);
+            final Intent intent = new Intent(RecorderService.this, ClassifierService.class);
+            intent.putExtra("data", sampler.getData());
+            startService(intent);
         }
 
     };
 
     final Handler handler = new Handler();
 
-    float[] data = new float[256];
-    volatile int nextSample = 0;
-
     boolean running;
     final Aggregator aggregator = new Aggregator();
     AccelReader reader;
+    Sampler sampler;
     public static Map<Float[], String> model;
     private final List<Classification> classifications = new ArrayList<Classification>();
 
-    public void analyse(float[] data) {
-        //Log.i(getClass().getName(), "Analysing");
-        final Intent intent = new Intent(this, ClassifierService.class);
-        intent.putExtra("data", data);
-        startService(intent);
-    }
-
     @Override
     public IBinder onBind(Intent arg0) {
         return binder;
@@ -129,6 +106,7 @@ public class RecorderService extends Service {
         running = true;
 
         reader = new AccelReaderFactory().getReader(this);
+        sampler = new Sampler(handler, reader, analyseRunnable);
 
         init();
     }
@@ -162,10 +140,11 @@ public class RecorderService extends Service {
         if (running) {
             running = false;
 
-            handler.removeCallbacks(sampleRunnable);
+            if (sampler != null) {
+                sampler.stop();
+            }
+            
             handler.removeCallbacks(registerRunnable);
-
-            reader.stopSampling();
         }
     }
 

code/Common/accel/Sampler.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2009-2010 Chris Smith
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package uk.co.md87.android.common.accel;
+
+import android.os.Handler;
+
+/**
+ *
+ * @author chris
+ */
+public class Sampler implements Runnable {
+
+    private final Handler handler;
+    private final AccelReader reader;
+    private final Runnable finishedRunnable;
+
+    private float[] data;
+    private int nextSample;
+
+    public Sampler(final Handler handler, final AccelReader reader,
+            final Runnable finishedRunnable) {
+        this.handler = handler;
+        this.reader = reader;
+        this.finishedRunnable = finishedRunnable;
+    }
+
+    public void start() {
+        data = new float[256];
+        nextSample = 0;
+
+        reader.startSampling();
+
+        handler.postDelayed(this, 50);
+    }
+
+    public float[] getData() {
+        return data;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void run() {
+        final float[] values = reader.getSample();
+
+        data[nextSample * 2] = values[0];
+        data[nextSample * 2 + 1] = values[1];
+
+        if (++nextSample == 128) {
+            reader.stopSampling();
+            finishedRunnable.run();
+            return;
+        }
+
+        handler.postDelayed(this, 50);
+    }
+
+    public void stop() {
+        handler.removeCallbacks(this);
+    }
+
+}