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

.github/workflows/docker.yml

@@ -14,7 +14,6 @@ env:
 
 jobs:
   build-and-push-image:
-    if: github.repository == 'eclipse-sumo/sumo'
     runs-on: ubuntu-latest
     permissions:
       contents: read

.github/workflows/documentation.yml

@@ -13,7 +13,6 @@ jobs:
   # building the documentation
   ############################
   build-and-internal-link-check:
-    if: github.repository == 'eclipse-sumo/sumo'
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/jupedsim-windows.yml

@@ -16,7 +16,6 @@ on:
 
 jobs:
   build:
-    if: github.repository == 'DLR-TS/sumo' || github.event_name == 'pull_request'
     runs-on: windows-latest
     strategy:
       # Allow all other matrix-jobs to continue running, even if one of the jobs fails

.github/workflows/wheel-linux.yml → .github/workflows/linux-wheels.yml

@@ -40,14 +40,12 @@ jobs:
         python3 -m build -o ../wheelhouse
 
     - name: Building SUMO / libsumo Python wheels (latest manylinux docker)
-      # if: github.repository == 'DLR-TS/sumo'
       uses: docker://quay.io/pypa/manylinux2014_x86_64
       with:
         entrypoint: tools/build_config/build_wheels.sh
 
     # the next two steps are only needed when we debug the manylinux build
     # - name: Building Python wheels (fixed manylinux docker)
-    #   if: github.repository == 'eclipse-sumo/sumo'
     #   uses: docker://quay.io/pypa/manylinux2014_x86_64:2022-11-14-1226cfc
     #   with:
     #     entrypoint: tools/build_config/build_wheels.sh
@@ -98,7 +96,6 @@ jobs:
         testenv/bin/python -c "import sumo; print('SUMO_HOME=' + sumo.SUMO_HOME)" >> $GITHUB_ENV
 
     - name: Running "sumo in the wheel" tests
-      if: github.repository == 'DLR-TS/sumo'
       run: |
         source testenv/bin/activate
         python3 -m pip install -r tools/req_ci.txt -r tools/requirements.txt
@@ -133,7 +130,7 @@ jobs:
   # publishing wheels
   ###################
   publish-wheels:
-    if: github.repository == 'eclipse-sumo/sumo' && (github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags'))
+    if: github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags')
     needs: [test-wheels]
     runs-on: ubuntu-latest
     permissions:
@@ -143,13 +140,6 @@ jobs:
     - name: Downloading Wheels artifact
       uses: actions/download-artifact@v4
 
-    - name: Publish to Test PyPI
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        packages-dir: manylinux-wheels/
-        repository-url: https://test.pypi.org/legacy/
-        skip-existing: true
-
     - name: Publish to PyPI
       if: startsWith(github.ref, 'refs/tags')
       uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/build-linux.yml → .github/workflows/linux.yml

@@ -45,7 +45,7 @@ jobs:
         pipx install texttest
 
     - name: Validate CITATION.cff
-      if: matrix.build_type == 'full' && github.repository == 'DLR-TS/sumo' && github.event_name == 'schedule' && matrix.compiler == 'gcc'
+      if: matrix.build_type == 'full' && github.event_name == 'schedule' && matrix.compiler == 'gcc'
       uses: dieghernan/cff-validator@v3
       with:
         install-r: true
@@ -88,11 +88,11 @@ jobs:
         make traas
 
     - name: Setting up SonarQube
-      if: matrix.build_type == 'full' && github.repository == 'eclipse-sumo/sumo' && github.event_name == 'schedule' && matrix.compiler == 'gcc'
+      if: matrix.build_type == 'full' && github.event_name == 'schedule' && matrix.compiler == 'gcc'
       uses: warchant/setup-sonar-scanner@v8
 
     - name: Building SUMO with SonarQube wrapper
-      if: matrix.build_type == 'full' && github.repository == 'eclipse-sumo/sumo' && github.event_name == 'schedule' && matrix.compiler == 'gcc'
+      if: matrix.build_type == 'full' && github.event_name == 'schedule' && matrix.compiler == 'gcc'
       run: |
         cd sumo/cmake-build
         curl -L -O https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip
@@ -102,14 +102,13 @@ jobs:
         sonar-scanner -Dsonar.token=${{ secrets.SONAR_TOKEN }} -Dsonar.cfamily.compile-commands=cmake-build/bw-output/compile_commands.json
 
     - name: Building and Installing SUMO
-      if: matrix.build_type != 'full' || github.repository != 'eclipse-sumo/sumo' || github.event_name != 'schedule' || matrix.compiler != 'gcc'
       run: |
         cd sumo/cmake-build
         make -j4
         sudo make install
 
     - name: Building Examples and Tests
-      if: matrix.build_type == 'full' && (github.repository == 'DLR-TS/sumo' || matrix.compiler == 'gcc')
+      if: matrix.build_type == 'full'
       # need to explicitly uninstall matplotlib below because pandas pulls it in but we need a newer version for test stability
       # having both installed confuses matplotlib https://github.com/matplotlib/matplotlib/issues/26827
       # the pipdeptree below is also just for debugging but often comes handy so keep it enabled

.github/workflows/wheel-macos.yml → .github/workflows/macos-wheels.yml

@@ -130,7 +130,6 @@ jobs:
         python3 -c "import sumo; print('SUMO_HOME=' + sumo.SUMO_HOME)" >> $GITHUB_ENV
 
     - name: Running "sumo in the wheel" tests
-      if: github.repository == 'DLR-TS/sumo'
       run: |
         if [[ "${{ matrix.python_version }}" != "3.12" ]]; then python3 -m pip install -r tools/requirements.txt; fi
         tests/runTests.sh -b ci -v ci.fast -a activitygen,duarouter,jtrrouter,marouter,od2trips,polyconvert
@@ -173,7 +172,7 @@ jobs:
   # publishing wheels
   ###################
   publish-wheels:
-    if: github.repository == 'eclipse-sumo/sumo' && (github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags'))
+    if: github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags')
     needs: [test-wheels]
     runs-on: ubuntu-latest
     permissions:
@@ -185,13 +184,6 @@ jobs:
         path: python-wheels
         merge-multiple: true
 
-    - name: Publish to Test PyPI
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        packages-dir: python-wheels/
-        repository-url: https://test.pypi.org/legacy/
-        skip-existing: true
-
     - name: Publish to PyPI
       if: startsWith(github.ref, 'refs/tags')
       uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/wheel-cibw.yml

@@ -112,7 +112,6 @@ jobs:
         python3 -c "import sumo; print('SUMO_HOME=' + sumo.SUMO_HOME)" >> $GITHUB_ENV
 
     - name: Running "sumo in the wheel" tests
-      if: github.repository == 'DLR-TS/sumo'
       run: |
         if [[ "${{ matrix.python_version }}" != "3.12" ]]; then python3 -m pip install -r tools/requirements.txt; fi
         tests/runTests.sh -b ci -v ci.fast -a activitygen,duarouter,jtrrouter,marouter,od2trips,polyconvert

.github/workflows/wheel-windows.yml → .github/workflows/windows-wheels.yml

@@ -160,7 +160,6 @@ jobs:
         python -c "import sumo; print('SUMO_HOME=' + sumo.SUMO_HOME)" >> $env:GITHUB_ENV
 
     - name: Running "sumo in the wheel" tests
-      if: github.repository == 'DLR-TS/sumo'
       run: |
         python -m pip install -r tools/req_ci.txt -r tools/requirements.txt
         $env:TEXTTEST_CI_APPS = "-v ci.fast -a activitygen,dfrouter,duarouter,jtrrouter,marouter,netgen,od2trips,polyconvert,netconvert,sumo"
@@ -169,7 +168,6 @@ jobs:
 #        tests\runCiTests.bat $env:pythonLocation\Scripts\texttestc.py
 
     - name: Running "sumo in the wheel" meta tests
-      if: github.repository != 'DLR-TS/sumo'
       run: |
         $env:TEXTTEST_CI_APPS = "-ts meta"
         tests\runCiTests.bat $env:pythonLocation\Scripts\texttestc.py
@@ -199,7 +197,7 @@ jobs:
   # publishing wheels
   ###################
   publish-wheels:
-    if: github.repository == 'eclipse-sumo/sumo' && (github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags'))
+    if: github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags')
     needs: [test-wheels]
     runs-on: ubuntu-latest
     permissions:
@@ -216,12 +214,6 @@ jobs:
         mv ./*-wheels/* dist
         rm -f dist/sumolib* dist/traci*
 
-    - name: Publish to Test PyPI
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        repository-url: https://test.pypi.org/legacy/
-        skip-existing: true
-
     - name: Publish to PyPI
       if: startsWith(github.ref, 'refs/tags')
       uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/build-windows.yml → .github/workflows/windows.yml

@@ -100,7 +100,7 @@ jobs:
         ctest -R texttest --verbose
 
     - name: Examples and extra tests
-      if: matrix.build_type == 'extra' && github.repository == 'DLR-TS/sumo'
+      if: matrix.build_type == 'extra'
       run: |
         python -m pip install -r sumo/tools/req_ci.txt -r sumo/tools/requirements.txt
         cd sumo/build_msvc
@@ -112,14 +112,14 @@ jobs:
         ctest --build-config Release --verbose
 
     - name: Compressing test results
-      if: failure() && github.repository == 'DLR-TS/sumo'
+      if: failure()
       run: |
         dir d:\texttest
         Compress-Archive -Path D:/texttest -DestinationPath D:/texttest/tt.zip
         dir d:\texttest
 
     - name: Uploading test results
-      if: failure() && github.repository == 'DLR-TS/sumo'
+      if: failure()
       uses: actions/upload-artifact@v4
       with:
         name: texttesttmp-${{ matrix.build_type }}

data/xsd/routeTypes.xsd

@@ -65,6 +65,7 @@
         <xsd:attribute name="lcLookaheadLeft" type="nonNegativeFloatType"/>
         <xsd:attribute name="lcSpeedGainRight" type="nonNegativeFloatType"/>
         <xsd:attribute name="lcSpeedGainLookahead" type="nonNegativeFloatType"/>
+        <xsd:attribute name="lcSpeedGainRemainTime" type="nonNegativeFloatType"/>
         <xsd:attribute name="lcCooperativeRoundabout" type="nonNegativeFloatType"/>
         <xsd:attribute name="lcCooperativeSpeed" type="nonNegativeFloatTypeWithErrorValue"/>
         <xsd:attribute name="lcTurnAlignmentDistance" type="nonNegativeFloatType"/>

docs/web/docs/ChangeLog.md

@@ -1599,6 +1599,7 @@ title: ChangeLog
   - Option **--junctions.join** can now join intersections with more than 4 incoming edges. Issue #12261
   - Walkingarea shapes for pure pedestrian intersections now match the junction shape. Issue #12377
   - Added option **--plain-output.lanes** to include all lane attributes in plain-xml output. Issue #12443
+  - Added options **--default.crossing-speed** and **--default.walkingarea-speed** to configure a default maximum speed on pedestrian infrastructure. Issue #11527
 
 - netedit
   - It is now possible to load and save a *.sumocfg* file and also to edit all sumo options (SHIFT-F10). Issue #11896

src/microsim/devices/MSDevice_Bluelight.cpp

@@ -113,6 +113,7 @@ MSDevice_Bluelight::notifyMove(SUMOTrafficObject& veh, double /* oldPos */,
         // advance as far as possible (assume vehicles will keep moving out of the way)
         ego.getLaneChangeModel().setParameter(toString(SUMO_ATTR_LCA_STRATEGIC_PARAM), "-1");
         ego.getLaneChangeModel().setParameter(toString(SUMO_ATTR_LCA_SPEEDGAIN_LOOKAHEAD), "0");
+        ego.getLaneChangeModel().setParameter(toString(SUMO_ATTR_LCA_SPEEDGAIN_REMAIN_TIME), "0");
         try {
             ego.getLaneChangeModel().setParameter(toString(SUMO_ATTR_MINGAP_LAT), "0");
         } catch (InvalidArgument&) {
@@ -124,6 +125,8 @@ MSDevice_Bluelight::notifyMove(SUMOTrafficObject& veh, double /* oldPos */,
                                               ego.getVehicleType().getParameter().getLCParamString(SUMO_ATTR_LCA_STRATEGIC_PARAM, "1"));
         ego.getLaneChangeModel().setParameter(toString(SUMO_ATTR_LCA_SPEEDGAIN_LOOKAHEAD),
                                               ego.getVehicleType().getParameter().getLCParamString(SUMO_ATTR_LCA_SPEEDGAIN_LOOKAHEAD, "5"));
+        ego.getLaneChangeModel().setParameter(toString(SUMO_ATTR_LCA_SPEEDGAIN_REMAIN_TIME),
+                                              ego.getVehicleType().getParameter().getLCParamString(SUMO_ATTR_LCA_SPEEDGAIN_REMAIN_TIME, "20"));
         try {
             ego.getLaneChangeModel().setParameter(toString(SUMO_ATTR_MINGAP_LAT),
                                                   toString(ego.getVehicleType().getMinGapLat()));

src/microsim/lcmodels/MSLCM_LC2013.cpp

@@ -110,6 +110,7 @@ MSLCM_LC2013::MSLCM_LC2013(MSVehicle& v) :
     mySpeedGainRight(v.getVehicleType().getParameter().getLCParam(SUMO_ATTR_LCA_SPEEDGAINRIGHT, 0.1)),
     myAssertive(v.getVehicleType().getParameter().getLCParam(SUMO_ATTR_LCA_ASSERTIVE, 1)),
     mySpeedGainLookahead(v.getVehicleType().getParameter().getLCParam(SUMO_ATTR_LCA_SPEEDGAIN_LOOKAHEAD, 0)),
+    mySpeedGainRemainTime(v.getVehicleType().getParameter().getLCParam(SUMO_ATTR_LCA_SPEEDGAIN_REMAIN_TIME, 20)),
     myRoundaboutBonus(v.getVehicleType().getParameter().getLCParam(SUMO_ATTR_LCA_COOPERATIVE_ROUNDABOUT, myCooperativeParam)),
     myCooperativeSpeed(v.getVehicleType().getParameter().getLCParam(SUMO_ATTR_LCA_COOPERATIVE_SPEED, myCooperativeParam)),
     myKeepRightAcceptanceTime(v.getVehicleType().getParameter().getLCParam(SUMO_ATTR_LCA_KEEPRIGHT_ACCEPTANCE_TIME, -1)),
@@ -1818,7 +1819,7 @@ MSLCM_LC2013::_wantsChange(
 #endif
 
         if (mySpeedGainProbability < -myChangeProbThresholdRight
-                && neighDist / MAX2(.1, myVehicle.getSpeed()) > 20.) { //./MAX2( .1, myVehicle.getSpeed())) { // -.1
+                && neighDist / MAX2(.1, myVehicle.getSpeed()) > mySpeedGainRemainTime) { //./MAX2( .1, myVehicle.getSpeed())) { // -.1
             req = ret | lca | LCA_SPEEDGAIN;
             if (!cancelRequest(req, laneOffset)) {
                 return ret | req;
@@ -1865,7 +1866,7 @@ MSLCM_LC2013::_wantsChange(
 
         if (mySpeedGainProbability > myChangeProbThresholdLeft
                 && (relativeGain > NUMERICAL_EPS || changeLeftToAvoidOvertakeRight)
-                && neighDist / MAX2(.1, myVehicle.getSpeed()) > 20.) { // .1
+                && neighDist / MAX2(.1, myVehicle.getSpeed()) > mySpeedGainRemainTime) { // .1
             req = ret | lca | LCA_SPEEDGAIN;
             if (!cancelRequest(req, laneOffset)) {
                 return ret | req;
@@ -2111,6 +2112,8 @@ MSLCM_LC2013::getParameter(const std::string& key) const {
         return toString(myOvertakeDeltaSpeedFactor);
     } else if (key == toString(SUMO_ATTR_LCA_SPEEDGAIN_LOOKAHEAD)) {
         return toString(mySpeedGainLookahead);
+    } else if (key == toString(SUMO_ATTR_LCA_SPEEDGAIN_REMAIN_TIME)) {
+        return toString(mySpeedGainRemainTime);
     } else if (key == toString(SUMO_ATTR_LCA_COOPERATIVE_ROUNDABOUT)) {
         return toString(myRoundaboutBonus);
     } else if (key == toString(SUMO_ATTR_LCA_COOPERATIVE_SPEED)) {
@@ -2176,6 +2179,8 @@ MSLCM_LC2013::setParameter(const std::string& key, const std::string& value) {
         myOvertakeDeltaSpeedFactor = doubleValue;
     } else if (key == toString(SUMO_ATTR_LCA_SPEEDGAIN_LOOKAHEAD)) {
         mySpeedGainLookahead = doubleValue;
+    } else if (key == toString(SUMO_ATTR_LCA_SPEEDGAIN_REMAIN_TIME)) {
+        mySpeedGainRemainTime = doubleValue;
     } else if (key == toString(SUMO_ATTR_LCA_COOPERATIVE_ROUNDABOUT)) {
         myRoundaboutBonus = doubleValue;
     } else if (key == toString(SUMO_ATTR_LCA_COOPERATIVE_SPEED)) {

src/microsim/lcmodels/MSLCM_LC2013.h

@@ -231,6 +231,8 @@ class MSLCM_LC2013 : public MSAbstractLaneChangeModel {
     double myAssertive;
     // @brief lookahead for speedGain in seconds
     double mySpeedGainLookahead;
+    // @brief the minimum time to spent driving without lane change after a speed-gain change
+    double mySpeedGainRemainTime;
     // @brief bounus factor staying on the inside of multi-lane roundabout
     double myRoundaboutBonus;
     // @brief factor for cooperative speed adjustment

src/microsim/lcmodels/MSLCM_SL2015.cpp

@@ -63,8 +63,6 @@
 #define TURN_LANE_DIST 200.0 // the distance at which a lane leading elsewhere is considered to be a turn-lane that must be avoided
 #define GAIN_PERCEPTION_THRESHOLD 0.05 // the minimum relative speed gain which affects the behavior
 
-#define SPEED_GAIN_MIN_SECONDS 20.0
-
 #define ARRIVALPOS_LAT_THRESHOLD 100.0
 
 // the speed at which the desired lateral gap grows now further
@@ -147,6 +145,7 @@ MSLCM_SL2015::MSLCM_SL2015(MSVehicle& v) :
     mySpeedGainRight(v.getVehicleType().getParameter().getLCParam(SUMO_ATTR_LCA_SPEEDGAINRIGHT, 0.1)),
     myLaneDiscipline(v.getVehicleType().getParameter().getLCParam(SUMO_ATTR_LCA_LANE_DISCIPLINE, 0.0)),
     mySpeedGainLookahead(v.getVehicleType().getParameter().getLCParam(SUMO_ATTR_LCA_SPEEDGAIN_LOOKAHEAD, 5)),
+    mySpeedGainRemainTime(v.getVehicleType().getParameter().getLCParam(SUMO_ATTR_LCA_SPEEDGAIN_REMAIN_TIME, 20)),
     myRoundaboutBonus(v.getVehicleType().getParameter().getLCParam(SUMO_ATTR_LCA_COOPERATIVE_ROUNDABOUT, myCooperativeParam)),
     myCooperativeSpeed(v.getVehicleType().getParameter().getLCParam(SUMO_ATTR_LCA_COOPERATIVE_SPEED, myCooperativeParam)),
     myKeepRightAcceptanceTime(v.getVehicleType().getParameter().getLCParam(SUMO_ATTR_LCA_KEEPRIGHT_ACCEPTANCE_TIME, -1)),
@@ -1799,7 +1798,7 @@ MSLCM_SL2015::_wantsChangeSublane(
 
         // make changing on the right more attractive on bidi edges
         if (latDist < 0 && mySpeedGainProbabilityRight >= MAX2(myChangeProbThresholdRight * bidiRightFactor, mySpeedGainProbabilityLeft)
-                && neighDist / MAX2(.1, myVehicle.getSpeed()) > 20.) {
+                && neighDist / MAX2(.1, myVehicle.getSpeed()) > mySpeedGainRemainTime) {
             ret |= LCA_SPEEDGAIN;
             if (!cancelRequest(ret | getLCA(ret, latDist), laneOffset)) {
                 int blockedFully = 0;
@@ -1837,7 +1836,7 @@ MSLCM_SL2015::_wantsChangeSublane(
         if (latDist > 0 && mySpeedGainProbabilityLeft > myChangeProbThresholdLeft &&
                 // if we leave our lane, we should be able to stay in the new
                 // lane for some time
-                (stayInLane || neighDist / MAX2(.1, myVehicle.getSpeed()) > SPEED_GAIN_MIN_SECONDS)) {
+                (stayInLane || neighDist / MAX2(.1, myVehicle.getSpeed()) > mySpeedGainRemainTime)) {
             ret |= LCA_SPEEDGAIN;
             if (!cancelRequest(ret + getLCA(ret, latDist), laneOffset)) {
                 int blockedFully = 0;
@@ -3784,6 +3783,8 @@ MSLCM_SL2015::getParameter(const std::string& key) const {
         return toString(myOvertakeDeltaSpeedFactor);
     } else if (key == toString(SUMO_ATTR_LCA_SPEEDGAIN_LOOKAHEAD)) {
         return toString(mySpeedGainLookahead);
+    } else if (key == toString(SUMO_ATTR_LCA_SPEEDGAIN_REMAIN_TIME)) {
+        return toString(mySpeedGainRemainTime);
     } else if (key == toString(SUMO_ATTR_LCA_COOPERATIVE_ROUNDABOUT)) {
         return toString(myRoundaboutBonus);
     } else if (key == toString(SUMO_ATTR_LCA_COOPERATIVE_SPEED)) {
@@ -3867,6 +3868,8 @@ MSLCM_SL2015::setParameter(const std::string& key, const std::string& value) {
         myOvertakeDeltaSpeedFactor = doubleValue;
     } else if (key == toString(SUMO_ATTR_LCA_SPEEDGAIN_LOOKAHEAD)) {
         mySpeedGainLookahead = doubleValue;
+    } else if (key == toString(SUMO_ATTR_LCA_SPEEDGAIN_REMAIN_TIME)) {
+        mySpeedGainRemainTime = doubleValue;
     } else if (key == toString(SUMO_ATTR_LCA_COOPERATIVE_ROUNDABOUT)) {
         myRoundaboutBonus = doubleValue;
     } else if (key == toString(SUMO_ATTR_LCA_COOPERATIVE_SPEED)) {

src/microsim/lcmodels/MSLCM_SL2015.h

@@ -443,6 +443,8 @@ class MSLCM_SL2015 : public MSAbstractLaneChangeModel {
     double myLaneDiscipline;
     // @brief lookahead for speedGain in seconds
     double mySpeedGainLookahead;
+    // @brief the minimum time to spent driving without lane change after a speed-gain change
+    double mySpeedGainRemainTime;
     // @brief bonus factor staying on the inside of multi-lane roundabout
     double myRoundaboutBonus;
     // @brief factor for cooperative speed adjustment