minor cleanup for graphhopper#487

Author: Peter

core/src/main/java/com/graphhopper/GraphHopper.java

@@ -1088,8 +1088,7 @@ protected void cleanUp()
         preparation.setMinOneWayNetworkSize(minOneWayNetworkSize);
         logger.info("start finding subnetworks, " + Helper.getMemInfo());
         preparation.doWork();
-        int currNodeCount = ghStorage.getNodes();
-        // int remainingSubnetworks = preparation.findSubnetworks().size();
+        int currNodeCount = ghStorage.getNodes();        
         logger.info("edges: " + ghStorage.getAllEdges().getMaxId() + ", nodes " + currNodeCount
                 + ", there were " + preparation.getMaxSubnetworks()
                 + " subnetworks. removed them => " + (prevNodeCount - currNodeCount)

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

@@ -41,7 +41,7 @@ public DefaultEdgeFilter( FlagEncoder encoder, boolean in, boolean out )
         this.encoder = encoder;
         this.in = in;
         this.out = out;
-    }    
+    }
 
     @Override
     public final boolean accept( EdgeIteratorState iter )

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

@@ -211,17 +211,16 @@ String toString( FlagEncoder encoder, EdgeIterator iter )
     }
 
     /**
-     * Clean small networks that will be never be visited by this explorer See #86 for example,
-     * small areas like parking lots are sometimes connected to the whole network through a one-way
-     * road. This is clearly an error - but is causes the routing to fail when a point gets
-     * connected to this small area. This routine removes all these points from the graph.
+     * This method removes networks that will be never be visited by this filter. See #235 for
+     * example, small areas like parking lots are sometimes connected to the whole network through a
+     * one-way road. This is clearly an error - but is causes the routing to fail when a point gets
+     * connected to this small area. This routine removes all these networks from the graph.
      * <p/>
      * @return number of removed edges
      */
     int removeDeadEndUnvisitedNetworks( final PrepEdgeFilter bothFilter )
     {
-        // Partition g into strongly connected components using Tarjan's algorithm.
-
+        // partition ghStorage into strongly connected components using Tarjan's algorithm
         final EdgeFilter outFilter = new DefaultEdgeFilter(bothFilter.getEncoder(), false, true);
         List<TIntArrayList> components = new TarjansStronglyConnectedComponentsAlgorithm(ghStorage, outFilter).
                 findComponents();

core/src/test/java/com/graphhopper/routing/util/PrepareRoutingSubnetworksTest.java

@@ -131,7 +131,7 @@ public void testKeepLargestNetworks()
         assertEquals(Arrays.<String>asList(), GHUtility.getProblems(g));
 
         components = instance.findSubnetworks(filter);
-        assertEquals(1, components.size());        
+        assertEquals(1, components.size());
     }
 
     @Test
@@ -166,6 +166,7 @@ public void testRemoveNode()
         PrepareRoutingSubnetworks instance = new PrepareRoutingSubnetworks(g, em2.fetchEdgeEncoders());
 
         EdgeExplorer edgeExplorer = g.createEdgeExplorer();
+        assertFalse(instance.detectNodeRemovedForAllEncoders(edgeExplorer, 4));
         assertFalse(instance.detectNodeRemovedForAllEncoders(edgeExplorer, 5));
         assertFalse(instance.detectNodeRemovedForAllEncoders(edgeExplorer, 6));
 
@@ -186,8 +187,6 @@ public void testRemoveNode()
     @Test
     public void testRemoveSubnetworkWhenMultipleVehicles()
     {
-        // do not remove because of two vehicles with different subnetworks
-        // TODO create different access for bike and car
         FlagEncoder carEncoder = new CarFlagEncoder();
         BikeFlagEncoder bikeEncoder = new BikeFlagEncoder();
         EncodingManager em2 = new EncodingManager(carEncoder, bikeEncoder);
@@ -197,12 +196,20 @@ public void testRemoveSubnetworkWhenMultipleVehicles()
         instance.setMinNetworkSize(5);
         instance.doWork();
         g.optimize();
+        // remove nothing because of two vehicles with different subnetworks
         assertEquals(9, g.getNodes());
 
-        EdgeExplorer explorer = g.createEdgeExplorer(new DefaultEdgeFilter(carEncoder));
-        assertEquals(GHUtility.asSet(7, 2, 1), GHUtility.getNeighbors(explorer.setBaseNode(3)));
-
-        // TODO remove only nodes which are removed for both vehicles        
+        EdgeExplorer carExplorer = g.createEdgeExplorer(new DefaultEdgeFilter(carEncoder));
+        assertEquals(GHUtility.asSet(7, 2, 1), GHUtility.getNeighbors(carExplorer.setBaseNode(3)));
+        EdgeExplorer bikeExplorer = g.createEdgeExplorer(new DefaultEdgeFilter(bikeEncoder));
+        assertEquals(GHUtility.asSet(7, 2, 1, 4), GHUtility.getNeighbors(bikeExplorer.setBaseNode(3)));
+        
+        GHUtility.getEdge(g, 3, 4).setFlags(carEncoder.setProperties(10, false, false) | bikeEncoder.setProperties(5, false, false));
+        instance = new PrepareRoutingSubnetworks(g, em2.fetchEdgeEncoders());
+        instance.setMinNetworkSize(5);
+        instance.doWork();
+        g.optimize();
+        assertEquals(6, g.getNodes());
     }
 
     GraphHopperStorage createDeadEndUnvisitedNetworkStorage( EncodingManager em )

core/src/test/java/com/graphhopper/util/GHUtilityTest.java

@@ -78,7 +78,6 @@ public void testSort2()
     {
         Graph g = initUnsorted(createGraph());
         Graph newG = GHUtility.sortDFS(g, createGraph());
-        // TODO does not handle subnetworks
         assertEquals(g.getNodes(), newG.getNodes());
         NodeAccess na = newG.getNodeAccess();
         assertEquals(0, na.getLatitude(0), 1e-4); // 0