Now predicts journeys

Added JourneyUtil class with common functionality

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/ContextAnalyserService.java

@@ -32,6 +32,7 @@ import android.os.IBinder;
 import android.util.Log;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -44,6 +45,8 @@ import uk.co.md87.android.common.aggregator.AutoAggregator;
 import uk.co.md87.android.common.aggregator.AutoAggregatorFactory;
 import uk.co.md87.android.common.geo.LocationMonitor;
 import uk.co.md87.android.common.geo.LocationMonitorFactory;
+import uk.co.md87.android.contextanalyser.model.Journey;
+import uk.co.md87.android.contextanalyser.model.JourneyStep;
 import uk.co.md87.android.contextanalyser.model.Place;
 
 /**
@@ -205,6 +208,8 @@ public class ContextAnalyserService extends Service {
         if (location == null && lastLocation != null) {
             // We're going somewhere - record the activity
             activityLog.add(newActivity);
+
+            checkPredictions();
         }
 
         if (!newActivity.equals(lastActivity)) {
@@ -219,6 +224,32 @@ public class ContextAnalyserService extends Service {
         }
     }
 
+    protected void checkPredictions() {
+        final Collection<Journey> journeys = dataHelper.findJourneys(lastLocation);
+        final List<JourneyStep> mySteps = JourneyUtil.getSteps(activityLog);
+
+        int total = 0;
+        final Iterator<Journey> it = journeys.iterator();
+        while (it.hasNext()) {
+            final Journey journey = it.next();
+
+            if (journey.getSteps() < mySteps.size()) {
+                it.remove();
+                continue;
+            }
+
+            final List<JourneyStep> theirSteps = dataHelper.getSteps(journey);
+
+            if (JourneyUtil.isCompatible(mySteps, theirSteps)) {
+                total += journey.getNumber();
+            } else {
+                it.remove();
+            }
+        }
+
+        Log.i(getClass().getSimpleName(), "Predictions: " + journeys);
+    }
+
     @Override
     public void onDestroy() {
         super.onDestroy();

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/DataHelper.java

@@ -53,7 +53,7 @@ public class DataHelper {
     public static final String JOURNEYSTEPS_TABLE = "journeysteps";
 
     private static final String DATABASE_NAME = "contextapi.db";
-    private static final int DATABASE_VERSION = 6;
+    private static final int DATABASE_VERSION = 7;
 
     private static final String INSERT_LOCATION = "insert into "
       + LOCATIONS_TABLE + "(name, lat, lon) values (?, ?, ?)";
@@ -157,7 +157,7 @@ public class DataHelper {
     }
 
     public void addJourney(final Place start, final Place end, final List<String> activities) {
-        final List<JourneyStep> steps = getSteps(activities);
+        final List<JourneyStep> steps = JourneyUtil.getSteps(activities);
         final Collection<Journey> journeys = findJourneys(start, end);
 
         for (Journey journey : journeys) {
@@ -189,30 +189,6 @@ public class DataHelper {
         }
     }
 
-    protected static List<JourneyStep> getSteps(final List<String> activities) {
-        final List<JourneyStep> steps = new LinkedList<JourneyStep>();
-
-        String last = null;
-        int count = 0;
-
-        for (String activity : activities) {
-            if (activity.equals(last)) {
-                count++;
-            } else {
-                if (last != null) {
-                    steps.add(new JourneyStep(last, count));
-                }
-
-                count = 1;
-                last = activity;
-            }
-        }
-
-        steps.add(new JourneyStep(last, count));
-
-        return steps;
-    }
-
     public List<JourneyStep> getSteps(final Journey journey) {
         final Map<Long, JourneyStep> results
                 = new HashMap<Long, JourneyStep>(journey.getSteps());
@@ -290,7 +266,7 @@ public class DataHelper {
                     + " (_id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, lon REAL, lat REAL)");
             db.execSQL("CREATE TABLE " + JOURNEYS_TABLE
                     + " (_id INTEGER PRIMARY KEY AUTOINCREMENT, start INTEGER,"
-                    + " end INTEGER, steps INTEGER)");
+                    + " end INTEGER, steps INTEGER, number INTEGER)");
             db.execSQL("CREATE TABLE " + JOURNEYSTEPS_TABLE
                     + " (_id INTEGER PRIMARY KEY AUTOINCREMENT, activity TEXT,"
                     + " repetitions INTEGER, journey INTEGER, next INTEGER)");
@@ -304,7 +280,7 @@ public class DataHelper {
             if (oldVersion <= 2) {
                 db.execSQL("DROP TABLE " + LOCATIONS_TABLE);
                 onCreate(db);
-            } else if (oldVersion <= 6) {
+            } else if (oldVersion <= 7) {
                 db.execSQL("DROP TABLE " + LOCATIONS_TABLE);
                 db.execSQL("DROP TABLE " + JOURNEYS_TABLE);
                 db.execSQL("DROP TABLE " + JOURNEYSTEPS_TABLE);

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/JourneyUtil.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.contextanalyser;
+
+import java.util.LinkedList;
+import java.util.List;
+import uk.co.md87.android.contextanalyser.model.JourneyStep;
+
+/**
+ * Provides utility methods relating to journeys.
+ * 
+ * @author chris
+ */
+public class JourneyUtil {
+
+    public static List<JourneyStep> getSteps(final List<String> activities) {
+        final List<JourneyStep> steps = new LinkedList<JourneyStep>();
+
+        String last = null;
+        int count = 0;
+
+        for (String activity : activities) {
+            if (activity.equals(last)) {
+                count++;
+            } else {
+                if (last != null) {
+                    steps.add(new JourneyStep(last, count));
+                }
+
+                count = 1;
+                last = activity;
+            }
+        }
+
+        steps.add(new JourneyStep(last, count));
+
+        return steps;
+    }
+
+    public static boolean isCompatible(final List<JourneyStep> incomplete,
+            final List<JourneyStep> target) {
+        for (int i = 0; i < incomplete.size(); i++) {
+            final JourneyStep targetStep = target.get(i);
+            final JourneyStep incompleteStep = incomplete.get(i);
+
+            if (targetStep.getActivity().equals(incompleteStep.getActivity()) ||
+                    // ^ One of the activities is different
+                    (i < incomplete.size() - 1 && incompleteStep.getRepetitions()
+                    < targetStep.getRepetitions() * 0.5) ||
+                    // ^ Or a completed step is too short
+                    (incompleteStep.getRepetitions() > targetStep.getRepetitions() * 1.5)
+                    // ^ Or any step is too long
+                    ) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+}

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/model/Journey.java

@@ -65,4 +65,10 @@ public class Journey {
         return number;
     }
 
+    @Override
+    public String toString() {
+        return "Journey{" + "id=" + id + " start=" + start + " end=" + end
+                + " steps=" + steps + " number=" + number + '}';
+    }
+
 }