Merge branch 'main' of github.com:eclipse-sumo/sumo into Optimization…

…#13894
eclipse-sumo · Dec 5, 2023 · 88148d1 · 88148d1
2 parents 94e807c + ed266e0
commit 88148d1
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 23 deletions.
diff --git a/data/po/es_sumo.po b/data/po/es_sumo.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: sumo\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2023-11-22 18:12+0100\n"
-"PO-Revision-Date: 2023-12-04 15:41+0000\n"
+"PO-Revision-Date: 2023-12-05 10:08+0000\n"
 "Last-Translator: Angelo Banse <[email protected]>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/eclipse-sumo/"
 "applications/es/>\n"
@@ -2664,12 +2664,12 @@ msgstr "Vehículo '%'"
 #: C:\Repos\sumo/src\microsim\MSLane.cpp:2115
 #, c-format
 msgid "Teleporting vehicle '%' after"
-msgstr ""
+msgstr "Teleportando el vehículo '%'"
 
 #: C:\Repos\sumo/src\microsim\MSLane.cpp:2120
 #, c-format
 msgid "Removing vehicle '%' after"
-msgstr ""
+msgstr "Removiendo el vehículo '%'"
 
 #: C:\Repos\sumo/src\microsim\MSLane.cpp:2124
 #, c-format
@@ -2760,7 +2760,7 @@ msgstr "La carga de % falló."
 #: C:\Repos\sumo/src\microsim\MSNet.cpp:1664
 #, c-format
 msgid "Loading state from '%' failed."
-msgstr ""
+msgstr "Error al cargar el estado desde '%'."
 
 #: C:\Repos\sumo/src\microsim\MSRouteHandler.cpp:104
 #: C:\Repos\sumo/src\router\RORouteHandler.cpp:108
@@ -3099,7 +3099,7 @@ msgstr ""
 
 #: C:\Repos\sumo/src\microsim\MSVehicle.cpp:2778
 msgid "Suspicious right_before_left junction '%'."
-msgstr ""
+msgstr "Cruce right_before_left sospechoso '%'."
 
 #: C:\Repos\sumo/src\microsim\MSVehicle.cpp:4515
 msgid " for unknown reasons"
@@ -5633,7 +5633,7 @@ msgstr ""
 
 #: C:\Repos\sumo/src\netbuild\NBFrame.cpp:639
 msgid "Remove edges after joining"
-msgstr ""
+msgstr "Quitar aristas después de combinar"
 
 #: C:\Repos\sumo/src\netbuild\NBFrame.cpp:643
 msgid ""
@@ -6013,7 +6013,7 @@ msgstr ""
 
 #: C:\Repos\sumo/src\netbuild\NBNetBuilder.cpp:361
 msgid "Guessed % bike lanes."
-msgstr ""
+msgstr "Se estimaron % carriles de bicicleta."
 
 #: C:\Repos\sumo/src\netbuild\NBNetBuilder.cpp:372
 #, c-format
@@ -6048,7 +6048,7 @@ msgstr "Computando tipos de nodos"
 #: C:\Repos\sumo/src\netbuild\NBNetBuilder.cpp:447
 #, c-format
 msgid "Guessed % pedestrian crossings."
-msgstr ""
+msgstr "Se estimaron % pasos peatonales."
 
 #: C:\Repos\sumo/src\netbuild\NBNetBuilder.cpp:475
 msgid "Computing priorities"
@@ -6060,7 +6060,7 @@ msgstr ""
 
 #: C:\Repos\sumo/src\netbuild\NBNetBuilder.cpp:484
 msgid "Guessing and setting roundabouts"
-msgstr ""
+msgstr "Estimando y estableciendo rotondas"
 
 #: C:\Repos\sumo/src\netbuild\NBNetBuilder.cpp:487
 msgid " Guessed % roundabout(s)."
@@ -6153,7 +6153,7 @@ msgstr "ID de nodo '%' no válido."
 
 #: C:\Repos\sumo/src\netbuild\NBNode.cpp:465
 msgid " Removing self-looping edge '%'"
-msgstr ""
+msgstr " Eliminando la arista en bucle '%'"
 
 #: C:\Repos\sumo/src\netbuild\NBNode.cpp:744
 msgid "Could not compute indirect left turn shape at node '%'"
@@ -7196,7 +7196,7 @@ msgstr ""
 
 #: C:\Repos\sumo/src\netimport\NIFrame.cpp:325
 msgid "Uses speeds from types"
-msgstr ""
+msgstr "Usar velocidades de los tipos"
 
 #: C:\Repos\sumo/src\netimport\NIFrame.cpp:328
 msgid "Sets connector speed"
@@ -7918,7 +7918,7 @@ msgstr ""
 
 #: C:\Repos\sumo/src\netimport\NIImporter_OpenStreetMap.cpp:1864
 msgid "Ignoring restriction relation '%'."
-msgstr ""
+msgstr "Ignorando la relación de restricción '%'."
 
 #: C:\Repos\sumo/src\netimport\NIImporter_OpenStreetMap.cpp:1889
 #, c-format
@@ -8548,7 +8548,7 @@ msgstr ""
 #: C:\Repos\sumo/src\netimport\NIXMLEdgesHandler.cpp:705
 #, c-format
 msgid "Unknown edge '%' in roundabout."
-msgstr ""
+msgstr "Arista desconocida '%' en la rotonda."
 
 #: C:\Repos\sumo/src\netimport\NIXMLNodesHandler.cpp:151
 msgid "Missing position (at node ID='%')."
@@ -8715,7 +8715,7 @@ msgstr ""
 
 #: C:\Repos\sumo/src\netimport\vissim\tempstructs\NIVissimDisturbance.cpp:307
 msgid "NIVissimDisturbance: no connection"
-msgstr ""
+msgstr "NIVissimDisturbance: sin conexión"
 
 #: C:\Repos\sumo/src\netimport\vissim\tempstructs\NIVissimDisturbance.cpp:340
 #, c-format
@@ -10279,7 +10279,7 @@ msgstr ""
 
 #: C:\Repos\sumo/src\tools\emissionsDrivingCycle_main.cpp:78
 msgid "Defines the entry separator."
-msgstr ""
+msgstr "Define el carácter para separar las entradas."
 
 #: C:\Repos\sumo/src\tools\emissionsDrivingCycle_main.cpp:83
 msgid ""
@@ -11027,7 +11027,7 @@ msgstr ""
 #: C:\Repos\sumo/src\utils\vehicle\SUMORouteHandler.cpp:204
 #: C:\Repos\sumo/src\utils\vehicle\SUMORouteHandler.cpp:206
 msgid "Invalid parsing embedded VType"
-msgstr ""
+msgstr "Análisis no válido del tipo de vehículo incrustado"
 
 #: C:\Repos\sumo/src\utils\handlers\RouteHandler.cpp:1089
 msgid "A stop must be defined either with an edge or with an lane, not both"

diff --git a/docs/web/docs/Other/Projects.md b/docs/web/docs/Other/Projects.md
@@ -119,6 +119,8 @@ title: Projects
   controlled. To do so, it simulates the effects of the underlying
   layers, not their protocols in detail. This makes it especially fast
   and suitable for application developers.
+- [PedSUMO](https://github.com/M-Colley/pedsumo): PedSUMO is an enhancement to SUMO that explores the dynamic interaction between automated vehicles and pedestrians at unprioritized crossings, focusing on pedestrian behavior in response to vehicle-priority communication methods. This open-source project offers detailed algorithms, parameter insights, and an initial data analysis of Ingolstadt, Germany, paving the way for understanding the complex impact of automated vehicles in urban environments.
+
 
 ### Past Projects
 

diff --git a/tools/import/gtfs/gtfs2pt.py b/tools/import/gtfs/gtfs2pt.py
@@ -198,7 +198,7 @@ def mapFCD(options, typedNets):
         subprocess.call(call, shell=True)
 
 
-def traceMap(options, typedNets, fixedStops, invEdgeMap, radius=100):
+def traceMap(options, typedNets, fixedStops, invEdgeMap, radius=150):
     routes = collections.OrderedDict()
     for mode in sorted(typedNets.keys()):
         if options.verbose:
@@ -220,7 +220,9 @@ def traceMap(options, typedNets, fixedStops, invEdgeMap, radius=100):
                     fixed = fixedStops.get("%s.%s" % (tid, idx))
                     if fixed:
                         vias[idx] = invEdgeMap[fixed.lane[:fixed.lane.rfind("_")]]
-                mappedRoute = sumolib.route.mapTrace(trace, net, radius, fillGaps=options.fill_gaps, vias=vias)
+                mappedRoute = sumolib.route.mapTrace(trace, net, radius, verbose=options.verbose,
+                                                     fillGaps=options.fill_gaps, gapPenalty=5000., vias=vias,
+                                                     reversalPenalty=1000.)
                 if mappedRoute:
                     routes[tid] = [e.getID() for e in mappedRoute]
         if options.verbose:

diff --git a/tools/sumolib/route.py b/tools/sumolib/route.py
@@ -86,7 +86,7 @@ def _getMinPath(paths):
 
 
 def mapTrace(trace, net, delta, verbose=False, airDistFactor=2, fillGaps=0, gapPenalty=-1,
-             debug=False, direction=False, vClass=None, vias=None):
+             debug=False, direction=False, vClass=None, vias=None, reversalPenalty=0.):
     """
     matching a list of 2D positions to consecutive edges in a network.
     The positions are assumed to be dense (i.e. covering each edge of the route) and in the correct order.
@@ -108,7 +108,7 @@ def mapTrace(trace, net, delta, verbose=False, airDistFactor=2, fillGaps=0, gapP
             candidates = net.getNeighboringEdges(pos[0], pos[1], delta, not net.hasInternal)
         if debug:
             print("\n\npos:%s, %s" % (pos[0], pos[1]))
-            print("candidates:%s\n" % candidates)
+            print("candidates:%s\n" % [(e.getID(), c) for e, c in candidates])
         if verbose and not candidates:
             print("Found no candidate edges for %s,%s" % pos)
 
@@ -133,13 +133,15 @@ def mapTrace(trace, net, delta, verbose=False, airDistFactor=2, fillGaps=0, gapP
                             if debug:
                                 print("---------- same edge")
                         else:
-                            maxGap = min(airDistFactor * advance + edge.getLength() + path[-1].getLength(), fillGaps)
-                            extension, cost = net.getShortestPath(path[-1], edge, maxGap, fromPos=lastBase, toPos=base)
+                            penalty = airDistFactor * advance if gapPenalty < 0 else gapPenalty
+                            maxGap = min(penalty + edge.getLength() + path[-1].getLength(), fillGaps)
+                            extension, cost = net.getOptimalPath(path[-1], edge, maxCost=maxGap,
+                                                                 reversalPenalty=reversalPenalty,
+                                                                 fromPos=lastBase, toPos=base)
                             if extension is None:
                                 airLineDist = euclidean(
                                     path[-1].getToNode().getCoord(),
                                     edge.getFromNode().getCoord())
-                                penalty = airDistFactor * advance if gapPenalty < 0 else gapPenalty
                                 pathLength = path[-1].getLength() - lastBase + base + airLineDist + penalty
                                 baseDiff = abs(lastBase + advance -
                                                path[-1].getLength() - base - airLineDist) + penalty