diff --git a/CITATION.cff b/CITATION.cff index 10cafc804935..58588ef2c610 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -146,19 +146,19 @@ keywords: - simulation - microscopic - traffic -date-released: "2024-10-10" -version: 1.21.0 -doi: 10.5281/zenodo.13907886 +date-released: "2025-02-04" +version: 1.22.0 +doi: 10.5281/zenodo.14796685 repository-code: "https://github.com/eclipse-sumo/sumo" type: software url: "https://www.eclipse.dev/sumo/" identifiers: - description: "The GitHub tag" type: url - value: "https://github.com/eclipse-sumo/sumo/releases/tag/v1_21_0" + value: "https://github.com/eclipse-sumo/sumo/releases/tag/v1_22_0" - description: "The download folder" type: url - value: "https://sumo.dlr.de/releases/1.21.0/" + value: "https://sumo.dlr.de/releases/1.22.0/" license: - "EPL-2.0" - "GPL-2.0-or-later" diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a6c0a2559bf..fb5ac1022d62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ endif () cmake_minimum_required(VERSION 3.5) project("${PROJECT_NAME}" CXX C) -set(PACKAGE_VERSION "git") +set(PACKAGE_VERSION "1.22.0") # Check if libraries have to be found, depending on SUMO_LIBRARIES set(SUMO_LIBRARIES "$ENV{SUMO_LIBRARIES}" CACHE PATH "Location of SUMOLibraries dependencies") diff --git a/README.md b/README.md index eabf015e5b15..0ce3afedae04 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Eclipse SUMO - Simulation of Urban MObility =========================================== -[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.13907886.svg )](https://doi.org/10.5281/zenodo.13907886 ) +[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.13907886.svg )](https://doi.org/10.5281/zenodo.14796685) [![Windows](https://github.com/eclipse-sumo/sumo/actions/workflows/windows.yml/badge.svg)](https://github.com/eclipse-sumo/sumo/actions/workflows/windows.yml) [![Linux](https://github.com/eclipse-sumo/sumo/actions/workflows/linux.yml/badge.svg)](https://github.com/eclipse-sumo/sumo/actions/workflows/linux.yml) [![macOS](https://github.com/eclipse-sumo/sumo/actions/workflows/macos.yml/badge.svg)](https://github.com/eclipse-sumo/sumo/actions/workflows/macos.yml) diff --git a/build_config/package/sumo.metainfo.xml b/build_config/package/sumo.metainfo.xml index 65fa90dbf834..0f1283bc825d 100644 --- a/build_config/package/sumo.metainfo.xml +++ b/build_config/package/sumo.metainfo.xml @@ -40,6 +40,7 @@ + diff --git a/docs/web/docs/ChangeLog.md b/docs/web/docs/ChangeLog.md index 18ba9812e98d..de362d75ca7a 100644 --- a/docs/web/docs/ChangeLog.md +++ b/docs/web/docs/ChangeLog.md @@ -2,7 +2,7 @@ title: ChangeLog --- -## Git Main +## Version 1.22.0 (04.02.2025) ### Bugfixes @@ -66,10 +66,10 @@ title: ChangeLog - Simplified creation of laneArea detectors on short lanes #15142 - Vehicles placed in elevated lanes can now be moved #15367 - Fixed invalid route shown for non-default departLane #15056 - - Improve geometry of embedded routes #13980 + - Improve geometry of embedded routes #13980 - Fixed Crash when editing options before loading a network #13881 - Fixed text rendering of small elements when zoomed out #15185 - - Selectable area of a POI doesn't now corresponds to custom radius #15532 + - Selectable area of a POI doesn't now corresponds to custom radius #15532 - Fixed crash after undo-redo due to distributions #15642 - Fixed invalid behavior after pressing ESC key in person plan mode #15193 - Modified default vType is no longer written after being reset #14985 @@ -112,7 +112,7 @@ title: ChangeLog - Reloading a demand file now raises warnins rather than errors #16027 - Deleting one edge no longer removes crossings from other edges #16017 - Fixed selecting TAZ edges with a small selection #16100 - + - sumo-gui - Fixed framerate drop when zoomed in very far #15666 - Fixed missing elements in settings dialog when switching to another viewing scheme while the dialog is open #15637 @@ -138,7 +138,7 @@ title: ChangeLog - OSM: loading typemap *osmNetconvertPedestrians.typ.xml* no longer puts sidewalks on both sides of oneway streets (i.e. in the middle of a divided road). Legacy behavior can be restored with option **--osm.oneway-reverse-sidewalk** #16063 - OSM: fixed missing vehicle lane where access=yes and busway:right=lane #16061 - OSM: fixed missing stops in ptline-output #16101 - - OSM: fixed missing bus direction at oneway street with `oneway:psv=no` #16103 + - OSM: fixed missing bus direction at oneway street with `oneway:psv=no` #16103 - duarouter - Fixed crash when using stop with coordinates and option **--mapmatch.junctions** #15740 @@ -149,13 +149,13 @@ title: ChangeLog - marouter - Fixed invalid route involving vClass-restricted connection #15883 - + - netgenerate - No longer hangs when setting option **--rand.connectivity 1** #16089 - meso - Fixed gridlocks in roundabouts #14129 (regression in 1.4.0) - - Fixed invalid queue assignment for turning vehicles #16034 (regression in 1.7.0) + - Fixed invalid queue assignment for turning vehicles #16034 (regression in 1.7.0) - Fixed crash when using **--mapmatch.junctions** in a network with internal edges #15741 - Fixed crash when using **--time-to-teleport.disconnected** #15751 - Option **--time-to-teleport.disconnected** is now working when connections are missing #15777 @@ -164,7 +164,7 @@ title: ChangeLog - activitygen - - fixed crash when attribute is not set #15782 + - fixed crash when attribute is not set #15782 - TraCI - Fixed crash when calling `vehicle.getNextLinks` and `lane.getLinks` at junction type `allway_stop` or `priority_stop` #15603 (regression in 1.21.0) @@ -179,17 +179,17 @@ title: ChangeLog - When setting option **--keep-after-arrival**, vehicles that were affected by moveToXY while parking are no longer drawn after arrival. #16009 - Fixed result of `simulaton.convertRoad` when adjacent lanes have different widths #16105 - Fixed missing collision check between cars and remote-controlled pedestrian #16092 - + - Tools - matsim_importPlans.py: no longer writes unsorted trips with option **-vehicles-only** #15743 - generateBidiDistricts.py: Option **--radius** now takes effect regardless of edge length #15758 - countEdgeUsage.py: Fixed misleading warning message #15790 - sumolib: Fixed invalid result by `net.getShortestPath(..., ignoreDirection=True)` #15789 - Sumolib: Fixed crash in function `miscutils.getFlowNumber` #15799 - - sumolib: Can now set a new attribute in sumolib.xml element #15991 - - sumolib.xml: Fixed bug where parse_fast retrieves wrong attribute if one attribute is the end-suffix of another attribute #15901 + - sumolib: Can now set a new attribute in sumolib.xml element #15991 + - sumolib.xml: Fixed bug where parse_fast retrieves wrong attribute if one attribute is the end-suffix of another attribute #15901 - randomTrips.py: option **--fringe-factor** now works in lefthand networks #15876 - - randomTrips.py: Options **--random-departpos** and **--random-arrivalpos** now take effect for persons #15946 + - randomTrips.py: Options **--random-departpos** and **--random-arrivalpos** now take effect for persons #15946 - routeSampler.py: fixed crash when loading negative counts #15908 - gtfs2pt.py: Import now works when optional 'direction_id' is missing #15736 - Empty strings can now be passed via tool config file #15499 @@ -199,7 +199,7 @@ title: ChangeLog - osmGet.py: fixed missing public transport stops (also affects osmWebWizard.py) #16106 - + ### Enhancements - sumo @@ -210,9 +210,9 @@ title: ChangeLog - GLOSA Device now looks several phases into the future and can also take queues into account #15614 - Added new vType attributes `jmAdvance` and `jmExtraGap` to configure the behavior on junctions for crossing and merging streams of traffic #15654 - Added new attribute `jmStopLineGapMinor` to set the distance from the stop line at non-prioritized links #15442 - - vType attriubte `jmStopLineGap` now applies to allway_stop #15448 + - vType attriubte `jmStopLineGap` now applies to allway_stop #15448 - Added new vType attribute `lcStrategicLookahead` for configuring the lookahead distance when computing strategic best lanes #14718 - - Added new vType attribute `lcSpeedGainRemainTime` which controls the minimum time a vehicle can drive on the new lane after a tactical lane change (formerly hard-coded to 20s) #12109 + - Added new vType attribute `lcSpeedGainRemainTime` which controls the minimum time a vehicle can drive on the new lane after a tactical lane change (formerly hard-coded to 20s) #12109 - Added new insertion behavior `departLane="best_prob"` to increase throughput on multi-lane roads #15661 - Stationfinder device now supports state saving and loading #15607 - Traffic lights now supports the special value `offset="begin"` which lets the logic start in cycle-second 0 regardless of simulation begin time #15248 @@ -227,16 +227,16 @@ title: ChangeLog - Option **--pedestrian.jupedsim.wkt** can now be used to export geometry data from JuPedSim #14436 - railways - major rewrite of signal logic #7578 - - major improvement in railway simulation speed (simulation time reduced by ~50-75% depending on scenario size) #4379 + - major improvement in railway simulation speed (simulation time reduced by ~50-75% depending on scenario size) #4379 - Fixed various deadlocks #7493, #13262, #15474 - The signal block information that is written by option **--railsignal-block-output** now includes [information about the foe relationships](Simulation/Railways.md#railsignal-block-output) between driveways / blocks #14991 - - The new option **--railsignal.max-block-length** can be used to customized the threshold for warnings / driveway truncation #15819 + - The new option **--railsignal.max-block-length** can be used to customized the threshold for warnings / driveway truncation #15819 - The new option **--railsignal-vehicle-output** can be used to record entry and exit times of vehicles into signal blocks #14990 - - The new option **--time-to-teleport.railsignal-deadlock** can be used to detect signal based deadlocks #15561 + - The new option **--time-to-teleport.railsignal-deadlock** can be used to detect signal based deadlocks #15561 - The new optioin **--time-to-teleport.remove-constraint** can be used to resolve detected deadlocks which are caused by a signal constraint by deactivating a responsible constraint #14543 - The new option **--deadlock-output** can be use to log detected deadlocks and also their method of resolution - Logged deadlocks can be loaded as additional file to prevent them in a subsequent simulation #15569 - - A warning is given for unreasonable combinations of **--time-to-teleport** options #15816 + - A warning is given for unreasonable combinations of **--time-to-teleport** options #15816 - netedit - Additional output now writes chargingStation after parkingArea elements #15628 @@ -247,7 +247,7 @@ title: ChangeLog - The route for inspected vehicles is now highlighted #15930 - Added 62 python tools to the menu #16076 - + - sumo-gui - The value of SUMO_HOME is now shown in the *About Dialog* (also for netedit) #15218 - The lane parameter dialog provide information on driveway/foes that prevent train insertion #15823 @@ -255,7 +255,7 @@ title: ChangeLog - Improved layering of chargingStation and parkingArea #15826 - Disabled 'secondary shape' controls if no alternative net is loaded #12653 - edge color legend now shows the used attribute/key #16026 - + - netconvert - Added support for zipped shape files #15623 - street-sign-output now sets the sign angle corresponding to road geometry #15671 @@ -271,23 +271,23 @@ title: ChangeLog - fcd-output can now be configured to include model attributes *segment, queue, entryTime, eventTime* and *blockTime* #15670 - Vehicle attribute `insertionChecks="none"` can now force insertion #16096 - + - duarouter - The input file for ALT-landmarks can now be defined with geo-coordinates #15855 - Option **--scale** can now be used for scaling traffic #8353 - + - polyconvert - Added option **--geosjon-files** for official geojson support #16055 - + - TraCI - stationfinder device parameters can now be modified at runtime #15622 - Added `traci.parkingArea.setAcceptedBadges` and `traci.parkingArea.getAcceptedBadges` #14807 - - Function `person.appendStage` now supports type `STAGE_TRIP` (`stage.line` is interpreted a `modes` and `stage.intended` as `group`) #15154 - + - Function `person.appendStage` now supports type `STAGE_TRIP` (`stage.line` is interpreted a `modes` and `stage.intended` as `group`) #15154 + - Tools - matsim_importPlans.py: Added options **-no-bikes** and **--no-rides** for filtering different modes of traffic. #15738 - sort_routes.py: Added option **--verbose** #15744 - - osmWebWizard.py: optionally can write output to existing folders #15783 + - osmWebWizard.py: optionally can write output to existing folders #15783 - emissionsMap: Now supports options **--vtype** and **--additional-files** #15812 - driveways2poly.py: Added new tool for visualizing train driveways #15027 - dxf2jupedsim.py: now supports projection 'none' @@ -298,14 +298,14 @@ title: ChangeLog - randomTrips.py: Added option **--edge-type-file** for affecting probabilities by edge type #15877 - randomTrips.py: Added option **--marouter** to write routes which take into account traffic load on the network #15881 - randomTrips.py: option **--flows** can now be used together with **--pedestrians** or **--persontrips** to create personFlows #12791 - - randomTrips.py: Added option **--poisson** to generate poisson-distributed flows (with option **--flows**) #13178 + - randomTrips.py: Added option **--poisson** to generate poisson-distributed flows (with option **--flows**) #13178 - routeStats.py: Added option **--edges-file** for counting the number of times per route that a specific edge (i.e. a counting) location was passed) #15900 - routeSampler.py: Added option **--verbose.timing** to print wall-clock-time performance statistics #15910 - routeSampler.py: Major increase in processing speed for long routes #15911 - routeSampler.py: Added option **--depart-distribution** to distribute departures within the counting data intervals #15909 - routeSampler.py: now warn about duplicate counting data #15997 - routeSampler.py: now includes GEH in mismatch-output #16000 - - routeSampler.py: Added option **--geh-scale** to permit custom scaling for GEH value (i.e. to avoid averaging daily counts over 24 hours) #16001 + - routeSampler.py: Added option **--geh-scale** to permit custom scaling for GEH value (i.e. to avoid averaging daily counts over 24 hours) #16001 - routeSampler.py: Options that set attributse to parse (i.e. **--edgedata-attribute**) now support a list of comma separated attributs (values are added) #16020 - edgeDataDiff.py: Added option **--geh-scale** to permit custom scaling for GEH value and otherwise scaling data to hourly values automatically #16002 - edgeDataDiff.py: Added option **--attributes** to allow comparing files with differing attribute names #15898 @@ -327,9 +327,9 @@ title: ChangeLog ### Miscellaneous - Added analysis on the effects of attribute `departLane` on [insertion capacity](Simulation/RoadCapacity.md#insertion_capacity_on_a_2-lane_road). -- Fixed compatibility issues with Ubuntu 24 affecting geo-projections #15618 +- Fixed compatibility issues with Ubuntu 24 affecting geo-projections #15618 - Option **--device.rerouting.railsignal** is now inactive by default #15597 -- If a turning movement has more than one lane and may wait within the intersection, the lanes after the *internal junction* are now joined into the same internal edge #14776 +- If a turning movement has more than one lane and may wait within the intersection, the lanes after the *internal junction* are now joined into the same internal edge #14776 ## Version 1.21.0 (10.10.2024) diff --git a/docs/web/mkdocs.yml b/docs/web/mkdocs.yml index 6cadd04c8162..10bb13ce6a93 100644 --- a/docs/web/mkdocs.yml +++ b/docs/web/mkdocs.yml @@ -76,8 +76,8 @@ markdown_extensions: - codehilite extra: - Version: 1.21.0 - ReleaseDate: 10.10.2024 + Version: 1.22.0 + ReleaseDate: 04.02.2025 DOI: "10.5281/zenodo.13907886" AdditionalFile: '[*additional-file*](/docs/sumo.html#format_of_additional_files)' diff --git a/src/config.h.cmake b/src/config.h.cmake index 88a610e1b78c..91356b20e56f 100644 --- a/src/config.h.cmake +++ b/src/config.h.cmake @@ -208,10 +208,10 @@ #cmakedefine HAVE_PYTHON /* Define if auto-generated version.h should be used. */ -#define HAVE_VERSION_H +//#define HAVE_VERSION_H #ifndef HAVE_VERSION_H /* Define if auto-generated version.h is unavailable. */ - #define VERSION_STRING "1.21.0" + #define VERSION_STRING "1.22.0" #endif /* defines the epsilon to use on general floating point comparison */