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

Author: palvarezlopez

CMakeLists.txt

@@ -123,7 +123,7 @@ if (GNU_COMPILER OR CLANG_COMPILER)
     endif ()
     if (GNU_COMPILER)
         # see https://stackoverflow.com/questions/23499909/adjust-variable-tracking-assignment-length
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --param=max-vartrack-size=1500000")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --param=max-vartrack-size=5000000")
     endif ()
     if (PROFILING)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg")

build_config/package/sumo.spec

@@ -35,8 +35,16 @@ BuildRequires:  cmake3
 BuildRequires:  cmake
 BuildRequires:  java-devel
 %endif
+%if 0%{?fedora_version} > 36 || 0%{?suse_version} >= 1600
+BuildRequires:  python3-build
+BuildRequires:  python3-pip
 BuildRequires:  python3-setuptools
+BuildRequires:  python3-wheel
+%endif
 BuildRequires:  python3-devel
+%if 0%{?fedora_version} || 0%{?suse_version}
+BuildRequires:  python3-matplotlib
+%endif
 BuildRequires:  swig
 BuildRequires:  help2man
 BuildRequires:  pkgconfig
@@ -84,6 +92,7 @@ Requires:       libsumocpp = %{version}
 This package provides development libraries and headers needed to build
 software using libsumocpp.
 
+%if 0%{?fedora_version} > 36 || 0%{?suse_version} >= 1600
 %package -n python3-libsumo
 Summary:        libsumo Python3 module
 Requires:       %{name} = %{version}-%{release}
@@ -92,6 +101,7 @@ Obsoletes:      python3-%{name} < %{version}
 
 %description -n python3-libsumo
 The libsumo python module provides support to connect to and remote control a running sumo simulation.
+%endif
 
 %if 0%{?fedora_version} || 0%{?centos_version}
 %global debug_package %{nil}
@@ -139,10 +149,8 @@ install -d -m 755 %{buildroot}%{_datadir}/pixmaps
 install -p -m 644 build_config/package/org.eclipse.sumo.png %{buildroot}%{_datadir}/pixmaps
 install -p -m 644 build_config/package/org.eclipse.sumo.netedit.png %{buildroot}%{_datadir}/pixmaps
 install -p -m 644 build_config/package/org.eclipse.sumo.osmWebWizard.png %{buildroot}%{_datadir}/pixmaps
-%if 0%{?suse_version}
 install -d -m 755 %{buildroot}%{_datadir}/mime/application
 install -p -m 644 build_config/package/org.eclipse.sumo.xml %{buildroot}%{_datadir}/mime/application
-%endif
 %fdupes %{buildroot}%{_datadir}
 
 %check
@@ -168,9 +176,7 @@ cd cmake-build
 %config %{_sysconfdir}/profile.d/%{name}.*sh
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*.png
-%if 0%{?suse_version}
 %{_datadir}/mime/application
-%endif
 
 %files -n libsumocpp
 %license LICENSE
@@ -181,12 +187,14 @@ cd cmake-build
 %license LICENSE
 %{_includedir}/libsumo
 
+%if 0%{?fedora_version} > 36 || 0%{?suse_version} >= 1600
 %files -n python3-libsumo
 %license LICENSE
 %{python3_sitelib}/sumolib*/
 %{python3_sitelib}/traci*/
 %{python3_sitelib}/simpla*/
 %{python3_sitearch}/libsumo*/
 %{python3_sitearch}/libtraci*/
+%endif
 
 %changelog

docs/web/docs/ChangeLog.md

@@ -6,6 +6,49 @@ title: ChangeLog
 
 ### Bugfixes
 
+- sumo
+  - Fixed deadlock in roundabout #17330 (regression in 1.24.0)
+  - Fixed inconsistent computation of attribute flow in edgeData output #17349
+  - Fixed invalid braking when trying to avoid junction blockage #17318
+  - Fixed incosistent lane-changing inside roundabout while on an internal lane #17336
+  - Fixed emergency braking in roundabout #17306
+  - Fixed invalid warning after train rerouting #17343
+
+- netedit
+  - No longer saving an invalid network when edges from prohibition elements are deleted #17331
+
+- duarouter
+  - Fixed crash when loading invalid routes with option **--skip-new-routes** and **--ignore-errors** #17348 (regression in 1.25.0)
+
+- TraCI
+  - function traci.vehicle.rerouteParkingArea now finds looped route from the current edge #17353
+
+
+- tools
+  - osmGet.py: fixed missing road nodes when using option **--shapes** #17293 (regression in 1.20.0)
+  - netdiff.py: fixed crash involving removed `<neigh>` attribute #17345
+
+### Enhancements
+
+- sumo
+  - Routing with randomized weights (**--weights.random-factor**) is now stable with respect to network changes, vehicle composition and state loading. The random noise for each edge only depends on the random seed and vehicle id (also applies to duarouter). If thew new option **--weights.random-factor.dynamic** is set, the randomness in the simulation also varies over time. #17325
+  - The new option **--output-suffix** can be used to modify the names of all output files (similar to **--output-prefix**). The suffix will be inserted right before the file name extension. #17338
+  - edgeData output definitions now support attribute `aggregate="taz"` which will aggregated data within each loaded taz definition #11104
+
+- TraCI
+  - function traci.simulation.findRoute now supports optional attributes departPos, arrivalPos #17352
+
+- tools
+  - attributeCompare.py: Now supports special id-attribute @FILE #17334
+  - [visum_convertXMLRoutes.py](Tools/Import/VISUM.md#visum_convertxmlroutespy): new tool for importing VISUM routes file #17347
+  - generateRerouters.py: Added option **--closed-edges.inpu-file** for loading edges to close from a selection file #17359
+
+
+### Miscellaneous
+
+- TraCI version is now 23
+
+
 ## Version 1.25.0 (13.11.2025)
 
 ### Bugfixes

src/microsim/MSBaseVehicle.cpp

@@ -394,7 +394,11 @@ MSBaseVehicle::reroute(SUMOTime t, const std::string& info, SUMOAbstractRouter<M
         }
         // !!! need to adapt t here
         router.compute(source, sourcePos, stopEdge, stopEdgeInfo.pos, this, t, into, silent || priority >= 0);
-        //std::cout << SIMTIME << " reroute veh=" << getID() << " source=" << source->getID() << " sourcePos=" << sourcePos << " target=" << stopEdgeInfo.edge->getID() << " targetPos=" << stopEdgeInfo.pos << " edges=" << toString(into) << "\n";
+#ifdef DEBUG_REROUTE
+        if (DEBUG_COND) {
+            std::cout << SIMTIME << " reroute veh=" << getID() << " source=" << source->getID() << " sourcePos=" << sourcePos << " target=" << stopEdgeInfo.edge->getID() << " targetPos=" << stopEdgeInfo.pos << " edges=" << toString(into) << "\n";
+        }
+#endif
         if (into.size() > 0) {
             while (stopIt != myStops.end() && stopIt->pars.edge != stopEdge->getID()) {
                 stopIt++;
@@ -456,16 +460,17 @@ MSBaseVehicle::reroute(SUMOTime t, const std::string& info, SUMOAbstractRouter<M
         }
     }
     if (hasSkipped) {
-        MSStopOptimizer opti(this);
-        edges = opti.optimizeSkipped(t, router, origSource, origSourcePos, stops, edges, maxDelay);
+        MSStopOptimizer opti(this, router, t, maxDelay);
+        edges = opti.optimizeSkipped(origSource, origSourcePos, stops, edges);
         for (auto stop : stops) {
-            if (stop.skipped) {
+            if (stop.skipped || stop.origEdge != nullptr) {
+                const MSEdge* origEdge = stop.origEdge == nullptr ? stop.edge : stop.origEdge;
                 if (stop.delay > 0) {
-                    WRITE_WARNING(TLF("Vehicle '%' skips stop on edge '%' with delay % at time %.", getID(), stop.edge->getID(), time2string(stop.delay), time2string(SIMSTEP)));
+                    WRITE_WARNING(TLF("Vehicle '%' skips stop on edge '%' with delay % at time %.", getID(), origEdge->getID(), time2string(stop.delay), time2string(SIMSTEP)));
                 } else if (stop.backtracked) {
-                    WRITE_WARNING(TLF("Vehicle '%' skips stop on edge '%' with priority % at time %.", getID(), stop.edge->getID(), stop.priority, time2string(SIMSTEP)));
+                    WRITE_WARNING(TLF("Vehicle '%' skips stop on edge '%' with priority % at time %.", getID(), origEdge->getID(), stop.priority, time2string(SIMSTEP)));
                 } else {
-                    WRITE_WARNING(TLF("Vehicle '%' skips unreachable stop on edge '%' with priority % at time %.", getID(), stop.edge->getID(), stop.priority, time2string(SIMSTEP)));
+                    WRITE_WARNING(TLF("Vehicle '%' skips unreachable stop on edge '%' with priority % at time %.", getID(), origEdge->getID(), stop.priority, time2string(SIMSTEP)));
                 }
             }
         }
@@ -717,10 +722,11 @@ MSBaseVehicle::replaceRoute(ConstMSRoutePtr newRoute, const std::string& info, b
             }
 #endif
             if (iter->edge == edges.end() && iter->pars.priority >= 0) {
+                const std::string oldEdge = iter->pars.edge;
                 const std::string oldName = iter->getStoppingPlaceName().first;
                 if (replaceWithAlternative(iter, searchStart, edges.end())) {
-                    WRITE_WARNINGF(TL("Vehicle '%' replaced stop % (named '%') and now stops at '%' instead; after rerouting (%) at time=%."),
-                            getID(), stopIndex, oldName, iter->getDescription(true), info, time2string(SIMSTEP));
+                    WRITE_WARNINGF(TL("Vehicle '%' replaced stop on edge '%' (named '%') and now stops at '%' instead; after rerouting (%) at time=%."),
+                            getID(), oldEdge, oldName, iter->getDescription(true), info, time2string(SIMSTEP));
                 }
             }
             if (iter->edge == edges.end()) {

src/microsim/MSBaseVehicle.h

@@ -1072,7 +1072,7 @@ class MSBaseVehicle : public SUMOVehicle {
         /// @brief optional info about stopping place
         std::pair<std::string, SumoXMLTag> nameTag;
         /// @brief set when replacing stop with an alternative
-        std::string origEdge = "";
+        const MSEdge* origEdge = nullptr;
 
         bool operator==(const StopEdgeInfo& o) const {
             return edge == o.edge;