arreglo con autociclos

Juan-David-Obando-Novoa · May 1, 2021 · 499ecfe · 499ecfe
1 parent f32d708
commit 499ecfe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/App/controller.py b/App/controller.py
@@ -73,7 +73,8 @@ def loadServices(analyzer, servicesfile):
         if lastservice is not None:
             sameservice = lastservice['ServiceNo'] == service['ServiceNo']
             samedirection = lastservice['Direction'] == service['Direction']
-            if sameservice and samedirection:
+            samebusStop = lastservice['BusStopCode'] == service['BusStopCode']
+            if sameservice and samedirection and not samebusStop:
                 model.addStopConnection(analyzer, lastservice, service)
         lastservice = service
     model.addRouteConnections(analyzer)

diff --git a/App/model.py b/App/model.py
@@ -91,6 +91,7 @@ def addStopConnection(analyzer, lastservice, service):
         destination = formatVertex(service)
         cleanServiceDistance(lastservice, service)
         distance = float(service['Distance']) - float(lastservice['Distance'])
+        distance = abs(distance)
         addStop(analyzer, origin)
         addStop(analyzer, destination)
         addConnection(analyzer, origin, destination, distance)