Concatenate edge-based paths properly for alternatives, fixes #2101

graphhopper · Aug 12, 2020 · f3d8bd5 · f3d8bd5
1 parent 6922bbe
commit f3d8bd5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 20 deletions.
diff --git a/core/src/main/java/com/graphhopper/routing/AlternativeRouteEdgeCH.java b/core/src/main/java/com/graphhopper/routing/AlternativeRouteEdgeCH.java
@@ -109,7 +109,6 @@ List<AlternativeInfo> calcAlternatives(final int s, final int t) {
             PotentialAlternativeInfo potentialAlternativeInfo = new PotentialAlternativeInfo();
             potentialAlternativeInfo.v = fromSPTEntry.adjNode;
             potentialAlternativeInfo.edgeIn = getIncomingEdge(fromSPTEntry);
-            potentialAlternativeInfo.edgeOut = getIncomingEdge(toSPTEntry);
             potentialAlternativeInfo.weight = 2 * (fromSPTEntry.getWeightOfVisitedPath() + toSPTEntry.getWeightOfVisitedPath()) + preliminaryShare;
             potentialAlternativeInfos.add(potentialAlternativeInfo);
             return true;
@@ -120,17 +119,18 @@ List<AlternativeInfo> calcAlternatives(final int s, final int t) {
         for (PotentialAlternativeInfo potentialAlternativeInfo : potentialAlternativeInfos) {
             int v = potentialAlternativeInfo.v;
             int tailSv = potentialAlternativeInfo.edgeIn;
-            int headVt = potentialAlternativeInfo.edgeOut;
 
             // Okay, now we want the s -> v -> t shortest via-path, so we route s -> v and v -> t
             // and glue them together.
             DijkstraBidirectionEdgeCHNoSOD svRouter = new DijkstraBidirectionEdgeCHNoSOD(graph);
-            final Path svPath = svRouter.calcPath(s, v, ANY_EDGE, tailSv);
+            final Path suvPath = svRouter.calcPath(s, v, ANY_EDGE, tailSv);
             extraVisitedNodes += svRouter.getVisitedNodes();
 
+            int u = graph.getBaseGraph().getEdgeIteratorState(tailSv, v).getBaseNode();
+
             DijkstraBidirectionEdgeCHNoSOD vtRouter = new DijkstraBidirectionEdgeCHNoSOD(graph);
-            final Path vtPath = vtRouter.calcPath(v, t, headVt, ANY_EDGE);
-            Path path = concat(graph.getBaseGraph(), svPath, vtPath);
+            final Path uvtPath = vtRouter.calcPath(u, t, tailSv, ANY_EDGE);
+            Path path = concat(graph.getBaseGraph(), suvPath, uvtPath);
             extraVisitedNodes += vtRouter.getVisitedNodes();
 
             double sharedDistanceWithShortest = sharedDistanceWithShortest(path);
@@ -148,7 +148,7 @@ List<AlternativeInfo> calcAlternatives(final int s, final int t) {
             // This is the final test we need: Discard paths that are not "locally shortest" around v.
             // So move a couple of nodes to the left and right from v on our path,
             // route, and check if v is on the shortest path.
-            final IntIndexedContainer svNodes = svPath.calcNodes();
+            final IntIndexedContainer svNodes = suvPath.calcNodes();
             int vIndex = svNodes.size() - 1;
             if (!tTest(path, vIndex))
                 continue;
@@ -236,21 +236,21 @@ private EdgeIteratorState getNextNodeTMetersAway(Path path, int vIndex, double T
         return edges.get(i - 1);
     }
 
-    private static Path concat(Graph graph, Path svPath, Path vtPath) {
-        assert svPath.isFound();
-        assert vtPath.isFound();
+    private static Path concat(Graph graph, Path suvPath, Path uvtPath) {
+        assert suvPath.isFound();
+        assert uvtPath.isFound();
         Path path = new Path(graph);
-        path.setFromNode(svPath.calcNodes().get(0));
-        for (EdgeIteratorState edge : svPath.calcEdges()) {
-            path.addEdge(edge.getEdge());
-        }
-        for (EdgeIteratorState edge : vtPath.calcEdges()) {
+        path.setFromNode(suvPath.calcNodes().get(0));
+        for (EdgeIteratorState edge : suvPath.calcEdges()) {
             path.addEdge(edge.getEdge());
         }
-        path.setEndNode(vtPath.getEndNode());
-        path.setWeight(svPath.getWeight() + vtPath.getWeight());
-        path.setDistance(svPath.getDistance() + vtPath.getDistance());
-        path.addTime(svPath.time + vtPath.time);
+        Iterator<EdgeIteratorState> uvtPathI = uvtPath.calcEdges().iterator();
+        uvtPathI.next(); // skip u-v edge
+        uvtPathI.forEachRemaining(edge -> path.addEdge(edge.getEdge()));
+        path.setEndNode(uvtPath.getEndNode());
+        path.setWeight(suvPath.getWeight() + uvtPath.getWeight());
+        path.setDistance(suvPath.getDistance() + uvtPath.getDistance());
+        path.addTime(suvPath.time + uvtPath.time);
         path.setFound(true);
         return path;
     }
@@ -271,7 +271,6 @@ public List<Path> calcPaths(int from, int to) {
     public static class PotentialAlternativeInfo {
         public int v;
         public int edgeIn;
-        public int edgeOut;
         double weight;
     }
 

diff --git a/core/src/test/java/com/graphhopper/routing/AlternativeRouteEdgeCHTest.java b/core/src/test/java/com/graphhopper/routing/AlternativeRouteEdgeCHTest.java
@@ -143,7 +143,7 @@ public void testCalcOtherAlternatives() {
         List<AlternativeRouteEdgeCH.AlternativeInfo> pathInfos = altDijkstra.calcAlternatives(10, 5);
         assertEquals(2, pathInfos.size());
         assertEquals(IntArrayList.from(10, 4, 3, 6, 5), pathInfos.get(0).path.calcNodes());
-        assertEquals(IntArrayList.from(10, 4, 3, 2, 9, 1, 5), pathInfos.get(1).path.calcNodes());
+        assertEquals(IntArrayList.from(10, 4, 8, 7, 6, 5), pathInfos.get(1).path.calcNodes());
         // The shortest path works (no restrictions on the way back
     }