Bugfix on SpeedTest - the graph is not indexed after it is loaded.

src/main/java/org/opentripplanner/datastore/OtpDataStore.java

@@ -8,6 +8,7 @@
 import org.opentripplanner.datastore.configure.DataStoreFactory;
 
 import javax.validation.constraints.NotNull;
+import java.io.File;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -93,6 +94,22 @@ public void open() {
         addAll(findMultipleSources(Collections.emptyList(), UNKNOWN));
     }
 
+    /**
+     * Static method used to get direct access to graph file without creating the
+     * {@link OtpDataStore} - this is used by other application and tests that want to load the
+     * graph from a directory on the local file system.
+     *
+     * Never use this method in OTP main application to access the graph, use the data store.
+     *
+     * @param path the location where the graph file must exist.
+     *
+     * @return The graph file - the graph is not loaded, you can use the
+     * {@link org.opentripplanner.routing.graph.Graph#load(File)} to load the graph.
+     */
+    public static File graphFile(File path) {
+        return new File(path, GRAPH_FILENAME);
+    }
+
     /**
      * @return a description(path) for each datasource used/enabled.
      */

src/test/java/org/opentripplanner/transit/raptor/speed_test/SpeedTest.java

@@ -1,5 +1,6 @@
 package org.opentripplanner.transit.raptor.speed_test;
 
+import org.opentripplanner.datastore.OtpDataStore;
 import org.opentripplanner.routing.algorithm.raptor.transit.TransitLayer;
 import org.opentripplanner.routing.algorithm.raptor.transit.TripSchedule;
 import org.opentripplanner.routing.algorithm.raptor.transit.mappers.TransitLayerMapper;
@@ -35,6 +36,7 @@
  * Also demonstrates how to run basic searches without using the graphQL profile routing API.
  */
 public class SpeedTest {
+
     private static final boolean TEST_NUM_OF_ADDITIONAL_TRANSFERS = false;
     private static final String TRAVEL_SEARCH_FILENAME = "travelSearch";
 
@@ -61,9 +63,9 @@ public class SpeedTest {
     private RangeRaptorService<TripSchedule> service;
 
 
-    private SpeedTest(Graph graph, SpeedTestCmdLineOpts opts) {
-        this.graph = graph;
+    private SpeedTest(SpeedTestCmdLineOpts opts) {
         this.opts = opts;
+        this.graph = loadGraph(opts.rootDir());
         this.transitLayer = TransitLayerMapper.map(graph);
         this.streetRouter = new EgressAccessRouter(graph, transitLayer);
         this.nAdditionalTransfers = opts.numOfExtraTransfers();
@@ -76,15 +78,20 @@ public static void main(String[] args) throws Exception {
         // Given the following setup
         AvgTimer.enableTimers(true);
         SpeedTestCmdLineOpts opts = new SpeedTestCmdLineOpts(args);
-        Graph graph = Graph.load(new File(opts.rootDir(), "Graph.obj"));
 
         // create a new test
-        SpeedTest speedTest = new SpeedTest(graph, opts);
+        SpeedTest speedTest = new SpeedTest(opts);
 
         // and run it
         speedTest.runTest();
     }
 
+    private static Graph loadGraph(File rootDir) {
+        Graph graph = Graph.load(OtpDataStore.graphFile(rootDir));
+        graph.index();
+        return graph;
+    }
+
     private void runTest() throws Exception {
         final SpeedTestProfile[] speedTestProfiles = opts.profiles();
         final int nSamples = opts.numberOfTestsSamplesToRun();