优化路径计算: 修正换乘数初始值并记录路径中的线路信息

lcy362 · May 15, 2024 · 87e47ee · 87e47ee
1 parent ac4190d
commit 87e47ee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/com/mobo/mobosubway/data/PathInfo.java b/src/main/java/com/mobo/mobosubway/data/PathInfo.java
@@ -26,7 +26,7 @@ public class PathInfo {
 
     private double distance = MAX_DISTANCE;
 
-    private int transferNum = -1; //换乘数
+    private int transferNum = 0; //换乘数
 
     @Deprecated
     private List<String> detail = new ArrayList<>(); //详细路径
@@ -55,12 +55,14 @@ public void addNodeToPath(NextStationInfo station) {
         PathNode pathNode = new PathNode();
         pathNode.setStationName(station.getName());
         pathNode.setStationId(station.getId());
-        if (!StringUtils.equals(station.getLine(), currentLine)) {
+        if (StringUtils.isNotBlank(currentLine) && !StringUtils.equals(station.getLine(), currentLine)) {
             transferNum++;
             pathNode.setTransfer(true);
         }
+        if (!StringUtils.equals(station.getLine(), currentLine)) {
+            pathLine.add(station.getLine());
+        }
         currentLine = station.getLine();
-        pathLine.add(currentLine);
 
         pathDetail.add(pathNode);
     }

diff --git a/src/main/java/com/mobo/mobosubway/router/DijkstraDistanceRouter.java b/src/main/java/com/mobo/mobosubway/router/DijkstraDistanceRouter.java
@@ -32,7 +32,10 @@ protected void handleAllPath(Map<String, PathInfo> knownPath, Map<String, PathIn
                         nextPath.setDistance(calculateNewDistance(nowPath, currentStation, nextPath));
                         log.debug("set " + stations.get(nextPath.getStationId()).getName() + " distance to " + nextPath.getDistance());
                         nextPath.setDetail(new ArrayList<>(nowPath.getDetail()));
+                        nextPath.setPathLine(new ArrayList<>(nowPath.getPathLine()));
                         nextPath.setPathDetail(new ArrayList<>(nowPath.getPathDetail()));
+                        nextPath.setTransferNum(nowPath.getTransferNum());
+                        nextPath.setCurrentLine(nowPath.getCurrentLine());
                         nextPath.addNodeToPath(currentStation.getNextStations().get(nextPath.getStationId()));
                     });