fix #4147

eclipse-sumo · Jun 1, 2018 · 0160d8f · 0160d8f
1 parent dfdfe95
commit 0160d8f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/libsumo/Simulation.cpp b/src/libsumo/Simulation.cpp
@@ -265,7 +265,7 @@ Simulation::findIntermodalRoute(const std::string& from, const std::string& to,
             if (!it->edges.empty()) {
                 if (it->line == "") {
                     result.push_back(TraCIStage(MSTransportable::MOVING_WITHOUT_VEHICLE));
-                } else if (vehicle != 0 && it->line == vehicle->getID()) {
+                } else {
                     result.push_back(TraCIStage(MSTransportable::DRIVING));
                 }
                 result.back().destStop = it->destStop;

diff --git a/tests/complex/traci/pythonApi/bugs/ticket4141/output.complex b/tests/complex/traci/pythonApi/bugs/ticket4141/output.complex
@@ -1,3 +1,10 @@
  Retrying in 1 seconds
-shortcut via trainStop: [Stage(stageType=2, line='', destStop='trainstop1', edges=['beg2left'], travelTime=240.00192, cost=240.00192, intended='', depart=-1.0), Stage(stageType=2, line='', destStop='', edges=['beg2left2'], travelTime=190.2624, cost=190.2624, intended='', depart=-1.0)]
-train ride [Stage(stageType=2, line='train', destStop='trainstop2', edges=['beg2left', 'gneE0'], travelTime=89.99999999999999, cost=89.99999999999999, intended='train.0', depart=300.0), Stage(stageType=2, line='', destStop='', edges=['left2end'], travelTime=238.26240000000004, cost=238.26240000000004, intended='', depart=-1.0)]
+shortcut via trainStop:
+  Stage(stageType=2, line='', destStop='trainstop1', edges=['beg2left'], travelTime=240.00192, cost=240.00192, intended='', depart=-1.0)
+  Stage(stageType=2, line='', destStop='', edges=['beg2left2'], travelTime=95.61120000000001, cost=95.61120000000001, intended='', depart=-1.0)
+
+train ride
+  Stage(stageType=2, line='', destStop='trainstop1', edges=['beg2left'], travelTime=240.00096000000002, cost=240.00096000000002, intended='', depart=-1.0)
+  Stage(stageType=3, line='train', destStop='trainstop2', edges=['gneE0'], travelTime=89.99999999999999, cost=89.99999999999999, intended='train.0', depart=300.0)
+  Stage(stageType=2, line='', destStop='', edges=['left2end'], travelTime=0.38880000000000114, cost=0.38880000000000114, intended='', depart=-1.0)
+
diff --git a/tests/complex/traci/pythonApi/bugs/ticket4141/runner.py b/tests/complex/traci/pythonApi/bugs/ticket4141/runner.py
@@ -25,6 +25,9 @@
 import sumolib  # noqa
 import traci.constants as tc
 
+def ppStages(comment, stages):
+    print("%s\n  %s\n" % (comment, "\n  ".join(map(str, stages))))
+
 sumoBinary = os.environ["SUMO_BINARY"]
 
 cmd = [sumoBinary,
@@ -34,6 +37,6 @@
         ]
 
 traci.start(cmd)
-print("shortcut via trainStop:", traci.simulation.findIntermodalRoute("beg2left", "beg2left2"))
-print("train ride", traci.simulation.findIntermodalRoute("beg2left", "left2end", modes="public"))
+ppStages("shortcut via trainStop:", traci.simulation.findIntermodalRoute("beg2left", "beg2left2"))
+ppStages("train ride", traci.simulation.findIntermodalRoute("beg2left", "left2end", modes="public"))
 traci.close()