more unit performance tests

Author: Peter

core/src/main/java/com/graphhopper/routing/util/LevelEdgeFilter.java

@@ -20,7 +20,6 @@
 import com.graphhopper.storage.LevelGraph;
 import com.graphhopper.util.EdgeIteratorState;
 import com.graphhopper.util.EdgeSkipIterState;
-import com.graphhopper.util.EdgeSkipIterator;
 
 /**
  * Only certain nodes are accepted and therefor the others are ignored.

tools/src/main/java/com/graphhopper/tools/Measurement.java

@@ -23,11 +23,8 @@
 import com.graphhopper.coll.GHBitSet;
 import com.graphhopper.coll.GHBitSetImpl;
 import com.graphhopper.routing.util.*;
+import com.graphhopper.storage.*;
 import com.graphhopper.storage.index.LocationIndex;
-import com.graphhopper.storage.Graph;
-import com.graphhopper.storage.GraphStorage;
-import com.graphhopper.storage.NodeAccess;
-import com.graphhopper.storage.RAMDirectory;
 import com.graphhopper.util.*;
 import com.graphhopper.util.shapes.BBox;
 
@@ -116,12 +113,13 @@ void start( CmdArgs args )
             throw new IllegalStateException("Graph has to be unprepared but wasn't!");
 
         String vehicleStr = args.get("graph.flagEncoders", "");
+        FlagEncoder encoder = hopper.getEncodingManager().getEncoder(vehicleStr);
         StopWatch sw = new StopWatch().start();
         try
         {
             maxNode = g.getNodes();
             GHBitSet allowedEdges = printGraphDetails(g, vehicleStr);
-            printMiscUnitPerfTests(hopper, vehicleStr, count * 100, allowedEdges);
+            printMiscUnitPerfTests(false, g, encoder, count * 100, allowedEdges);
             printLocationIndexQuery(g, hopper.getLocationIndex(), count);
 
             // Route via dijkstrabi. Normal routing takes a lot of time => smaller query number than CH
@@ -134,6 +132,10 @@ void start( CmdArgs args )
             // route via CH. do preparation before                        
             hopper.setCHEnable(true);
             hopper.doPostProcessing();
+
+            LevelGraph lg = (LevelGraph) g;
+            fillAllowedEdges(lg.getAllEdges(), allowedEdges);
+            printMiscUnitPerfTests(true, lg, encoder, count * 100, allowedEdges);
             printTimeOfRouteQuery(hopper, count, "routingCH", vehicleStr, true);
             printTimeOfRouteQuery(hopper, count, "routingCH_no_instr", vehicleStr, false);
             logger.info("store into " + propLocation);
@@ -161,6 +163,15 @@ void start( CmdArgs args )
         }
     }
 
+    void fillAllowedEdges( AllEdgesIterator iter, GHBitSet bs )
+    {
+        bs.clear();
+        while (iter.next())
+        {
+            bs.add(iter.getEdge());
+        }
+    }
+
     private GHBitSet printGraphDetails( GraphStorage g, String vehicleStr )
     {
         // graph size (edge, node and storage size)
@@ -172,10 +183,7 @@ private GHBitSet printGraphDetails( GraphStorage g, String vehicleStr )
         AllEdgesIterator iter = g.getAllEdges();
         final int maxEdgesId = g.getAllEdges().getCount();
         final GHBitSet allowedEdges = new GHBitSetImpl(maxEdgesId);
-        while (iter.next())
-        {
-            allowedEdges.add(iter.getEdge());
-        }
+        fillAllowedEdges(iter, allowedEdges);
         put("graph.valid_edges", allowedEdges.getCardinality());
         return allowedEdges;
     }
@@ -205,13 +213,47 @@ public int doCalc( boolean warmup, int run )
         print("location2id", miniPerf);
     }
 
-    private void printMiscUnitPerfTests( final GraphHopper hopper, String vehicle, int count,
-                                         final GHBitSet allowedEdges )
+    private void printMiscUnitPerfTests( boolean isCH, final Graph graph, final FlagEncoder encoder,
+                                         int count, final GHBitSet allowedEdges )
     {
         final Random rand = new Random(seed);
-        final GraphStorage graph = hopper.getGraph();
+        String description = "";
+        if (isCH)
+        {
+            description = "CH";
+            LevelGraph lg = (LevelGraph) graph;
+            final EdgeSkipExplorer chExplorer = lg.createEdgeExplorer(
+                    new LevelEdgeFilter((LevelGraph) graph));
+            MiniPerfTest miniPerf = new MiniPerfTest()
+            {
+                @Override
+                public int doCalc( boolean warmup, int run )
+                {
+                    int nodeId = rand.nextInt(maxNode);
+                    return GHUtility.count(chExplorer.setBaseNode(nodeId));
+                }
+            }.setIterations(count).start();
+            print("unit_testsCH.level_edge_state_next", miniPerf);
+
+            final EdgeSkipExplorer chExplorer2 = lg.createEdgeExplorer();
+            miniPerf = new MiniPerfTest()
+            {
+                @Override
+                public int doCalc( boolean warmup, int run )
+                {
+                    int nodeId = rand.nextInt(maxNode);
+                    EdgeSkipIterator iter = chExplorer2.setBaseNode(nodeId);
+                    while (iter.next())
+                    {
+                        if (iter.isShortcut())
+                            nodeId += (int) iter.getWeight();
+                    }
+                    return nodeId;
+                }
+            }.setIterations(count).start();
+            print("unit_testsCH.get_weight", miniPerf);
+        }
 
-        FlagEncoder encoder = hopper.getEncodingManager().getEncoder(vehicle);
         EdgeFilter outFilter = new DefaultEdgeFilter(encoder, false, true);
         final EdgeExplorer outExplorer = graph.createEdgeExplorer(outFilter);
         MiniPerfTest miniPerf = new MiniPerfTest()
@@ -223,7 +265,7 @@ public int doCalc( boolean warmup, int run )
                 return GHUtility.count(outExplorer.setBaseNode(nodeId));
             }
         }.setIterations(count).start();
-        print("unit_tests.out_edge_state_next", miniPerf);
+        print("unit_tests" + description + ".out_edge_state_next", miniPerf);
 
         final EdgeExplorer allExplorer = graph.createEdgeExplorer();
         miniPerf = new MiniPerfTest()
@@ -235,7 +277,7 @@ public int doCalc( boolean warmup, int run )
                 return GHUtility.count(allExplorer.setBaseNode(nodeId));
             }
         }.setIterations(count).start();
-        print("unit_tests.all_edge_state_next", miniPerf);
+        print("unit_tests" + description + ".all_edge_state_next", miniPerf);
 
         final int maxEdgesId = graph.getAllEdges().getCount();
         miniPerf = new MiniPerfTest()
@@ -251,7 +293,7 @@ public int doCalc( boolean warmup, int run )
                 }
             }
         }.setIterations(count).start();
-        print("unit_tests.get_edge_state", miniPerf);
+        print("unit_tests" + description + ".get_edge_state", miniPerf);
     }
 
     private void printTimeOfRouteQuery( final GraphHopper hopper, int count, String prefix,