Add journey and journey step classes

Reorganise into a model package
Add methods for finding journeys

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

@@ -22,6 +22,7 @@
 
 package uk.co.md87.android.contextanalyser;
 
+import uk.co.md87.android.contextanalyser.model.Place;
 import android.app.Service;
 import android.content.Intent;
 import android.location.Address;

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

@@ -30,9 +30,14 @@ import android.database.sqlite.SQLiteStatement;
 import android.location.Location;
 import android.util.Log;
 
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.Map;
 
+import uk.co.md87.android.contextanalyser.model.Journey;
+import uk.co.md87.android.contextanalyser.model.Place;
+
 /**
  * Facilitates accessing the SQLite database used for storing places and
  * journeys.
@@ -55,6 +60,8 @@ public class DataHelper {
     private static final String UNNAMED_QUERY = "name LIKE '%.%,%.%'";
     private static final String LOCATION_QUERY = "lat > %1$s - 0.005 and "
             + "lat < %1$s + 0.005 and lon > %2$s - 0.01 and lon < %2$s + 0.01";
+    private static final String JOURNEY_START_QUERY = "start = %1$s";
+    private static final String JOURNEY_BOTH_QUERY = JOURNEY_START_QUERY + " AND end = %1$s";
 
     private final SQLiteStatement insertLocationStatement, updateLocationStatement;
 
@@ -106,6 +113,39 @@ public class DataHelper {
         return results;
     }
 
+    public Collection<Journey> findJourneys(final Place start) {
+        return findJourneys(start, null);
+    }
+
+    public Collection<Journey> findJourneys(final Place start,
+            final Place end) {
+        final Collection<Journey> results = new LinkedList<Journey>();
+
+        final String query;
+        if (end == null) {
+            query = String.format(JOURNEY_START_QUERY, start.getId());
+        } else {
+            query = String.format(JOURNEY_BOTH_QUERY, start.getId(), end.getId());
+        }
+
+        final Cursor cursor = db.query(JOURNEYS_TABLE,
+                new String[] { "_id", "start", "end", "steps", "first" },
+                query, null, null, null, null);
+
+        if (cursor.moveToFirst()) {
+            do {
+                results.add(new Journey(cursor.getLong(0), cursor.getLong(1),
+                        cursor.getLong(2), cursor.getInt(3), cursor.getLong(4)));
+            } while (cursor.moveToNext());
+        }
+
+        if (cursor != null && !cursor.isClosed()) {
+            cursor.close();
+        }
+
+        return results;
+    }
+
     public Place findLocation(final double lat, final double lon) {
         final Cursor cursor = db.query(LOCATIONS_TABLE,
                 new String[] { Place._ID, Place.NAME, Place.LATITUDE, Place.LONGITUDE },
@@ -146,7 +186,7 @@ public class DataHelper {
                     + " end INTEGER, steps INTEGER, first INTEGER)");
             db.execSQL("CREATE TABLE " + JOURNEYSTEPS_TABLE
                     + " (_id INTEGER PRIMARY KEY AUTOINCREMENT, activity TEXT,"
-                    + " repetitions INTEGER, next INTEGER)");
+                    + " repetitions INTEGER, journey INTEGER, next INTEGER)");
         }
 
         /** {@inheritDoc} */

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

@@ -13,6 +13,8 @@ import android.database.Cursor;
 import android.database.SQLException;
 import android.net.Uri;
 
+import uk.co.md87.android.contextanalyser.model.Place;
+
 /**
  * A content provider for places.
  * 

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

@@ -0,0 +1,68 @@
+/*
+ * 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.model;
+
+/**
+ * A journey is a sequence of actions which were observed as the user travelled
+ * between one known {@link Place} and another.
+ *
+ * @author chris
+ */
+public class Journey {
+
+    private final long id;
+    private final long start;
+    private final long end;
+    private final int steps;
+    private final long first;
+
+    public Journey(final long id, final long start, final long end,
+            final int steps, final long first) {
+        this.id = id;
+        this.start = start;
+        this.end = end;
+        this.steps = steps;
+        this.first = first;
+    }
+
+    public long getEnd() {
+        return end;
+    }
+
+    public long getFirst() {
+        return first;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public long getStart() {
+        return start;
+    }
+
+    public int getSteps() {
+        return steps;
+    }
+
+}

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

@@ -0,0 +1,68 @@
+/*
+ * 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.model;
+
+/**
+ * A journey step is a single activity which occurred one or more times in a
+ * {@link Journey}. The activity may be repeated any number of times in a row.
+ *
+ * @author chris
+ */
+public class JourneyStep {
+
+    private final long id;
+    private final String activity;
+    private final int repetitions;
+    private final long journey;
+    private final long next;
+
+    public JourneyStep(final long id, final String activity,
+            final int repetitions, final long journey, final long next) {
+        this.id = id;
+        this.activity = activity;
+        this.repetitions = repetitions;
+        this.journey = journey;
+        this.next = next;
+    }
+
+    public String getActivity() {
+        return activity;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public long getJourney() {
+        return journey;
+    }
+
+    public long getNext() {
+        return next;
+    }
+
+    public int getRepetitions() {
+        return repetitions;
+    }
+
+}

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

@@ -20,10 +20,12 @@
  * SOFTWARE.
  */
 
-package uk.co.md87.android.contextanalyser;
+package uk.co.md87.android.contextanalyser.model;
 
 import android.net.Uri;
 
+import uk.co.md87.android.contextanalyser.PlacesContentProvider;
+
 /**
  * A place is a named location which has some significance for the user. Most
  * places come about when the user remains stationary for a period of time.