Merge pull request #69 from moia-oss/master

update matsim libs

Author: nkuehnel

.github/dependabot.yml

@@ -4,7 +4,11 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "daily"
+    groups:
+      github-actions:
+        patterns: ["*"]

.github/workflows/code-coverage.yaml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout git repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Java
         uses: actions/setup-java@v3

.github/workflows/codeql.yml

@@ -0,0 +1,49 @@
+name: CodeQL
+
+on:
+  push:
+    branches: 'master'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: 'ubuntu-latest'
+    timeout-minutes: 360
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: 'zulu'
+          cache: 'maven'
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: 'java'
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+
+          # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+          # queries: security-extended,security-and-quality
+
+
+      # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:java"

.github/workflows/deploy-on-pr-merge.yaml

@@ -10,22 +10,22 @@ on:
 jobs:
   deploy-snapshot:
     name: deploy PR-labelled version
-    # for PR-labelled deployment -- only if closed by merging
-    if: github.event_name == 'push' || github.event.pull_request.merged == true
+    # only if PR closed by merging
+    if: github.event.pull_request.merged == true
 
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout git repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
           java-version: 17
           distribution: 'zulu'
           cache: 'maven'
-          server-id: ${{ github.event_name == 'push' && 'matsim-snapshots' || 'matsim-releases' }} #choose mvn repo
+          server-id: 'matsim-releases'
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
 
@@ -43,5 +43,10 @@ jobs:
           MAVEN_USERNAME: ${{ secrets.REPOMATSIM_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.REPOMATSIM_TOKEN }}
 
+      - name: Submit Dependency Graph
+        # Generate a complete dependency graph and submit the graph to the GitHub repository.
+        # The goal is to improve security alerts from dependabot, because dependabot is not able to compute the complete dependency graph.
+        uses: advanced-security/maven-dependency-submission-action@v3
+
     env:
       MAVEN_OPTS: -Xmx2g

.github/workflows/deploy-on-release-created.yaml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Checkout git repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Java
         uses: actions/setup-java@v3

.github/workflows/deploy-weekly.yaml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout git repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Java
         uses: actions/setup-java@v3

.github/workflows/full-integration.yaml

@@ -1,6 +1,7 @@
 name: full-integration
 
 on:
+  workflow_dispatch:
   schedule:
     - cron: '30 0 * * *' # daily at 0:30 UTC
 
@@ -13,15 +14,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
       - name: Prepare git
         # turn off CRLF conversion (necessary on Windows)
         run: git config --global core.autocrlf false
 
       - name: Checkout git repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Java
         uses: actions/setup-java@v3

.github/workflows/verify-push.yaml

@@ -55,21 +55,22 @@ jobs:
           - contribs/socnetsim
           - contribs/sumo
           - contribs/pseudosimulation
+          - contribs/railsim
           - contribs/roadpricing
           - contribs/analysis
-          - contribs/eventsBasedPTRouter
           - contribs/hybridsim
           - contribs/informed-mode-choice
           - contribs/otfvis
           - contribs/osm
           - contribs/application
+          - contribs/simwrapper
           - contribs/sbb-extensions
           - contribs/simulatedannealing
           - benchmark
 
     steps:
       - name: Checkout git repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Detect changes against master
         # we only want to build matsim (module) if changes are not limited to contribs

benchmark/src/main/java/org/matsim/benchmark/Benchmark.java

@@ -32,7 +32,7 @@ public class Benchmark {
 	public static void main(String[] args) throws IOException {
 		Config config = ConfigUtils.loadConfig(IOUtils.extendUrl(ExamplesUtils.getTestScenarioURL("benchmark"), "config.xml"));
 		Controler ctl = new Controler(config);
-        ctl.getConfig().controler().setCreateGraphs(false);
+        ctl.getConfig().controller().setCreateGraphs(false);
         ctl.run();
 	}
 

contribs/README.md

@@ -7,44 +7,46 @@ Please note that these extensions are usually maintained and provided by single
 The MATSim core development team cannot make any guarantee that these extensions will be kept up-to-date and compatible with future releases, instead the maintainers themselves are responsible for this task.
 
 
-| Contrib                                                 | Short description                               |
-|---------------------------------------------------------|-------------------------------------------------|
-| [accessibility](accessibility/README.md) | Measuring accessibility in policy evaluation
-| accidents |
-| [analysis](analysis/README.md) |  Collection of matsim analysis tools
-| [application](application/README.md) | Build MATSim scenarios with preparation and analysis pipelines
-| [av](av/README.md) | Automated (autonomous) vehicle contrib
-| bicycle |
-| [cadytsIntegration](cadytsIntegration/README.md) | Calibration of dynamics traffic simulations
-| [carsharing](carsharing/README.md) | Simulate carsharing modes like station based or freefloatin
+| Contrib                                                                  | Short description                               |
+|--------------------------------------------------------------------------|-------------------------------------------------|
+| [accessibility](accessibility/README.md)                                 | Measuring accessibility in policy evaluation
+| accidents                                                                |
+| [analysis](analysis/README.md)                                           |  Collection of matsim analysis tools
+| [application](application/README.md)                                     | Build MATSim scenarios with preparation and analysis pipelines
+| [av](av/README.md)                                                       | Automated (autonomous) vehicle contrib
+| bicycle                                                                  |
+| [cadytsIntegration](cadytsIntegration/README.md)                         | Calibration of dynamics traffic simulations
+| [carsharing](carsharing/README.md)                                       | Simulate carsharing modes like station based or freefloatin
 | [commercialTrafficApplications](commercialTrafficApplications/README.md) | Collection of applications of the freight contrib in combination with one or more other contribs
-| common |
-| [decongestion](decongestion/README.md) | Compute tolls accordingly in order to reduce delays
-| [discrete_mode_choice](discrete_mode_choice/README.md)  |  Fine-grained and custom mode choice behaviour  
-| [drt](drt/README.md) |  Demand-responsive transport simulation
-| [drt-extensions](drt-extensions/README.md) |  Extensions for demand-responsive transport simulation
-| [dvrp](dvrp/README.md) | Tool for solving (dynamic) vehicle routing problem
-| [emissions](emissions/README.md) | Tool for exhaust emission calculation
-| [ev](ev/README.md) | Electric Vehicle functionality
-| eventsBasedPTRouter |
-| [freight](freight/README.md) | Package that plugs freight algorithms
-| [hybridsim](hybridsim/README.md) |
-| integration |
+| common                                                                   |
+| [decongestion](decongestion/README.md)                                   | Compute tolls accordingly in order to reduce delays
+| [discrete_mode_choice](discrete_mode_choice/README.md)                   |  Fine-grained and custom mode choice behaviour  
+| [drt](drt/README.md)                                                     |  Demand-responsive transport simulation
+| [drt-extensions](drt-extensions/README.md)                               |  Extensions for demand-responsive transport simulation
+| [dvrp](dvrp/README.md)                                                   | Tool for solving (dynamic) vehicle routing problem
+| [emissions](emissions/README.md)                                         | Tool for exhaust emission calculation
+| [ev](ev/README.md)                                                       | Electric Vehicle functionality
+| eventsBasedPTRouter                                                      |
+| [freight](freight/README.md)                                             | Package that plugs freight algorithms
+| [hybridsim](hybridsim/README.md)                                         |
+| integration                                                              |
 | [informed-mode-choice](informed-mode-choice/README.md)                   | Mode choice algorithms based on trip utility estimation
-| [locationchoice](locationchoice/README.md) | Location choice for discretionary activities
-| [matrixbasedptrouter](matrixbasedptrouter/README.md) | Calculate PT travel times using a set of stops and a pre-calculated travel time 
-| [minibus](minibus/README.md) | Runs an adaptive "minibus" model to serve given demand
-| [multimodal](multimodal/README.md) | Enables multi-modal simulation
-| [noise](noise/README.md) | Tools to compute various noise metrics (emissions, imission, exposure costs)
-| osm |
-| [otfvis](otfvis/README.md) | Visualiser for Matsim scenarios
-| [parking](parking/README.md) | Parking infrastructure and supply constraints
-| [protobuf](protobuf/README.md) | Protocol buffer implementation and converter for the MATSim event infrastructure
-| [pseudosimulation](pseudosimulation/README.md) | Pseudo-simulation to speed-up simulation times
-| [roadpricing](roadpricing/README.md) | Functionality to simulate different road-pricing scenarios in MATSim
-| [shared_mobility](shared_mobility/README.md) | Simulate human-driven shared mobility (i.e., micromobility)
-| [signals](signals/README.md) | Simulate traffic lights microscopically
-| [socnetsim](socnetsim/README.md) | Social network simulation
-| [sumo](sumo/README.md) | Converter and integrations for [SUMO](https://sumo.dlr.de/])
-| [taxi](taxi/README.md) | Taxi service functionality
-| vsp |
+| [locationchoice](locationchoice/README.md)                               | Location choice for discretionary activities
+| [matrixbasedptrouter](matrixbasedptrouter/README.md)                     | Calculate PT travel times using a set of stops and a pre-calculated travel time 
+| [minibus](minibus/README.md)                                             | Runs an adaptive "minibus" model to serve given demand
+| [multimodal](multimodal/README.md)                                       | Enables multi-modal simulation
+| [noise](noise/README.md)                                                 | Tools to compute various noise metrics (emissions, imission, exposure costs)
+| osm                                                                      |
+| [otfvis](otfvis/README.md)                                               | Visualiser for Matsim scenarios
+| [parking](parking/README.md)                                             | Parking infrastructure and supply constraints
+| [protobuf](protobuf/README.md)                                           | Protocol buffer implementation and converter for the MATSim event infrastructure
+| [pseudosimulation](pseudosimulation/README.md)                           | Pseudo-simulation to speed-up simulation times
+| [railsim](railsim/README.md)                                             | A large-scale hybrid micro- and mesoscopic simulation approach for railway operation
+| [roadpricing](roadpricing/README.md)                                     | Functionality to simulate different road-pricing scenarios in MATSim
+| [shared_mobility](shared_mobility/README.md)                             | Simulate human-driven shared mobility (i.e., micromobility)
+| [signals](signals/README.md)                                             | Simulate traffic lights microscopically
+| [simwrapper](simwrapper/README.md)                                       | Creates dashboards automatically with [SimWrapper](https://simwrapper.github.io/)
+| [socnetsim](socnetsim/README.md)                                         | Social network simulation
+| [sumo](sumo/README.md)                                                   | Converter and integrations for [SUMO](https://sumo.dlr.de/])
+| [taxi](taxi/README.md)                                                   | Taxi service functionality
+| vsp                                                                      |

contribs/accessibility/pom.xml

@@ -52,7 +52,7 @@
 		<dependency>
 			<groupId>org.openstreetmap.osmosis</groupId>
 			<artifactId>osmosis-core</artifactId>
-			<version>0.48.3</version>
+			<version>${osmosis.version}</version>
 			<exclusions>
 				<!-- needed to compile in IntelliJ with Eclipse compiler -->
 				<!-- see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=536928 -->
@@ -65,7 +65,7 @@
 		<dependency>
 			<groupId>org.openstreetmap.osmosis</groupId>
 			<artifactId>osmosis-xml</artifactId>
-			<version>0.48.3</version>
+			<version>${osmosis.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>

contribs/accessibility/src/main/java/org/matsim/contrib/accessibility/AccessibilityComputationNairobiLandUseLocalCopy.java

@@ -39,26 +39,26 @@
  */
 class AccessibilityComputationNairobiLandUseLocalCopy {
 	public static final Logger LOG = LogManager.getLogger(AccessibilityComputationNairobiLandUseLocalCopy.class);
-	
+
 	public static void main(String[] args) {
 		int tileSize_m = 500;
 		boolean push2Geoserver = false; // Set true for run on server
 		boolean createQGisOutput = true; // Set false for run on server
-		
+
 		final Config config = ConfigUtils.createConfig(new AccessibilityConfigGroup());
-		
+
 		Envelope envelope = new Envelope(246000, 271000, 9853000, 9863000); // Central part of Nairobi
 		String scenarioCRS = "EPSG:21037"; // EPSG:21037 = Arc 1960 / UTM zone 37S, for Nairobi, Kenya
-		
+
 		config.network().setInputFile("../nairobi/data/nairobi/input/2015-10-15_network.xml");
 		config.facilities().setInputFile("../nairobi/data/land_use/Nairobi_LU_2010/facilities.xml");
 		String runId = "ke_nairobi_landuse_hexagons_" + tileSize_m;
-		config.controler().setOutputDirectory("../nairobi/data/nairobi/output/" + runId + "_lcpt_par4_car_tr-7_500/");
-		config.controler().setRunId(runId);
-		
-		config.controler().setOverwriteFileSetting(OverwriteFileSetting.deleteDirectoryIfExists);
-		config.controler().setLastIteration(0);
-		
+		config.controller().setOutputDirectory("../nairobi/data/nairobi/output/" + runId + "_lcpt_par4_car_tr-7_500/");
+		config.controller().setRunId(runId);
+
+		config.controller().setOverwriteFileSetting(OverwriteFileSetting.deleteDirectoryIfExists);
+		config.controller().setLastIteration(0);
+
 		AccessibilityConfigGroup acg = ConfigUtils.addOrGetModule(config, AccessibilityConfigGroup.class);
 		acg.setAreaOfAccessibilityComputation(AreaOfAccesssibilityComputation.fromBoundingBoxHexagons);
 		acg.setEnvelope(envelope);
@@ -69,17 +69,17 @@ public static void main(String[] args) {
 		acg.setOutputCrs(scenarioCRS);
 
 		//acg.setUseParallelization(false);
-		
+
 		ConfigUtils.setVspDefaults(config);
-		
+
 		final Scenario scenario = ScenarioUtils.loadScenario(config);
-		
+
 //		final List<String> activityTypes = Arrays.asList(new String[]{"educational", "commercial", "industrial", "recreational", "water_body"});
 		final List<String> activityTypes = Arrays.asList(new String[]{"educational"});
 		final ActivityFacilities densityFacilities = AccessibilityUtils.createFacilityForEachLink(Labels.DENSITIY, scenario.getNetwork());
-		
+
 		final Controler controler = new Controler(scenario);
-		
+
 		for (String activityType : activityTypes) {
 			AccessibilityModule module = new AccessibilityModule();
 			module.setConsideredActivityType(activityType);
@@ -88,17 +88,17 @@ public static void main(String[] args) {
 			module.setCreateQGisOutput(createQGisOutput);
 			controler.addOverridingModule(module);
 		}
-		
+
 		controler.run();
-		
+
 		if (createQGisOutput) {
 			final Integer range = 9; // In the current implementation, this must always be 9
 			final Double lowerBound = -3.5; // (upperBound - lowerBound) ideally nicely divisible by (range - 2)
 			final Double upperBound = 3.5;
 			final int populationThreshold = (int) (10 / (1000/tileSize_m * 1000/tileSize_m)); // People per km^2 or roads (?)
-			
+
 			String osName = System.getProperty("os.name");
-			String workingDirectory = config.controler().getOutputDirectory();
+			String workingDirectory = config.controller().getOutputDirectory();
 			for (String actType : activityTypes) {
 				String actSpecificWorkingDirectory = workingDirectory + actType + "/";
 				for (Modes4Accessibility mode : acg.getIsComputingMode()) {