Merge branch 'matsim-org:master' into traveltime-bindings-in-hermes

KasiaKoz · Sep 14, 2023 · c7f3a91 · c7f3a91
2 parents 7c06dc6 + 48fdc96
commit c7f3a91
Show file tree

Hide file tree

Showing 1,709 changed files with 107,931 additions and 31,250 deletions.
diff --git a/.github/workflows/code-coverage.yaml b/.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

diff --git a/.github/workflows/deploy-on-pr-merge.yaml b/.github/workflows/deploy-on-pr-merge.yaml
@@ -1,9 +1,6 @@
 name: deploy-on-pr-merge
 
 on:
-  push: # snapshot deployment
-    branches:
-      - master
   pull_request_target: # pr-labelled deployment
     branches:
       - master
@@ -12,15 +9,15 @@ on:
 
 jobs:
   deploy-snapshot:
-    name: deploy snapshot/PR-labelled version
+    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
 
     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
@@ -32,8 +29,7 @@ jobs:
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
 
-      - name: Set MATSim version (if PR-labelled version)
-        if: github.event_name == 'pull_request_target'
+      - name: Set MATSim version
         run: mvn versions:set --batch-mode -DnewVersion=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout | sed 's/SNAPSHOT//')PR${{ github.event.pull_request.number }} -DgenerateBackupPoms=false
 
       # Build and publish are separated so we start deploying only after all jars are built successfully

diff --git a/.github/workflows/deploy-on-release-created.yaml b/.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

diff --git a/.github/workflows/deploy-weekly.yaml b/.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

diff --git a/.github/workflows/full-integration.yaml b/.github/workflows/full-integration.yaml
@@ -5,14 +5,23 @@ on:
     - cron: '30 0 * * *' # daily at 0:30 UTC
 
 jobs:
-  code-coverage:
+  run-full-integration:
     name: run full integration
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-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
@@ -23,7 +32,20 @@ jobs:
 
       # Run unit and integration tests
       - name: Run verify - release profile
-        run: mvn verify -P release --batch-mode --fail-at-end -Dmaven.test.redirectTestOutputToFile -Dmatsim.preferLocalDtds=true
+        # arguments containing dots (.) need to be quoted ('') so that PowerShell (Windows) does not parse them
+        run: mvn verify -P release --batch-mode --fail-at-end -D'maven.test.redirectTestOutputToFile' -D'matsim.preferLocalDtds=true'
 
     env:
       MAVEN_OPTS: -Xmx2g
+
+  verify-full-integration-successful:
+    # always() - to ensure this job is executed (regardless of the status of the previous job)
+    # run if push or pull_requests from fork
+    if: always()
+    needs: run-full-integration
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: check if the whole job matrix is successful
+        if: needs.run-full-integration.result != 'success'
+        run: exit 1 # fail if "test" was not successful
diff --git a/.github/workflows/verify-push.yaml b/.github/workflows/verify-push.yaml
@@ -44,6 +44,7 @@ jobs:
           - contribs/noise
           - contribs/accidents
           - contribs/freight
+          - contribs/freightreceiver
           - contribs/parking
           - contribs/matrixbasedptrouter
           - contribs/accessibility
@@ -58,15 +59,18 @@ jobs:
           - 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

diff --git a/README.md b/README.md
@@ -1,9 +1,7 @@
-[![deploy-on-pr-merge](https://github.com/matsim-org/matsim-libs/actions/workflows/deploy-on-pr-merge.yaml/badge.svg?event=push "snapshot release")](https://github.com/matsim-org/matsim-libs/actions/workflows/deploy-on-pr-merge.yaml)
 [![deploy-on-pr-merge](https://github.com/matsim-org/matsim-libs/actions/workflows/deploy-on-pr-merge.yaml/badge.svg?event=pull_request_target&branch= "PR-merge release")](https://github.com/matsim-org/matsim-libs/actions/workflows/deploy-on-pr-merge.yaml)
 [![deploy-weekly](https://github.com/matsim-org/matsim-libs/actions/workflows/deploy-weekly.yaml/badge.svg "weekly release")](https://github.com/matsim-org/matsim-libs/actions/workflows/deploy-weekly.yaml)
 [![full-integration](https://github.com/matsim-org/matsim-libs/actions/workflows/full-integration.yaml/badge.svg "daily release-like build")](https://github.com/matsim-org/matsim-libs/actions/workflows/full-integration.yaml)
 [![weekly-code-coverage](https://github.com/matsim-org/matsim-libs/actions/workflows/code-coverage.yaml/badge.svg "matsim module only")](https://github.com/matsim-org/matsim-libs/actions/workflows/code-coverage.yaml)
-[![windows-build](https://ci.appveyor.com/api/projects/status/fwsgslb0kl06q36d/branch/master?svg=true)](https://ci.appveyor.com/project/michalmac/matsim-libs/branch/master "Windows build")
 [![codecov - matsim only](https://codecov.io/gh/matsim-org/matsim-libs/branch/master/graph/badge.svg?token=3p7uJdHdnd "matsim module only")](https://codecov.io/gh/matsim-org/matsim-libs)
 
 ## Overview
@@ -48,7 +46,7 @@ Releases (also PR-based and weekly releases) and snapshots can be found at https
 
 An example how to get started with your own project, including a complete pom.xml, is at https://github.com/matsim-org/matsim-example-project .
 
-Code examples are at https://github.com/matsim-org/matsim-code-examples .
+Code examples are at https://github.com/matsim-org/matsim-code-examples.
 
 
 
diff --git a/appveyor.yml b/appveyor.yml
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>matsim-all</artifactId>
-		<version>15.0-SNAPSHOT</version>
+		<version>16.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
@@ -33,12 +33,12 @@
 		<dependency>
 			<groupId>org.matsim</groupId>
 			<artifactId>matsim</artifactId>
-			<version>15.0-SNAPSHOT</version>
+			<version>16.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim</groupId>
 			<artifactId>matsim-examples</artifactId>
-			<version>15.0-SNAPSHOT</version>
+			<version>16.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

diff --git a/contribs/README.md b/contribs/README.md
@@ -7,43 +7,45 @@ 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 |
-| [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 |
+| 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
+| [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                                                                      |
diff --git a/contribs/accessibility/pom.xml b/contribs/accessibility/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>15.0-SNAPSHOT</version>
+		<version>16.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.matsim.contrib</groupId>
@@ -37,12 +37,12 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>matrixbasedptrouter</artifactId>
-			<version>15.0-SNAPSHOT</version>
+			<version>16.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>roadpricing</artifactId>
-			<version>15.0-SNAPSHOT</version>
+			<version>16.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sf.trove4j</groupId>
@@ -70,7 +70,7 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>analysis</artifactId>
-			<version>15.0-SNAPSHOT</version>
+			<version>16.0-SNAPSHOT</version>
 		</dependency>
 <!--		<dependency>-->
 <!--			<groupId>org.matsim.contrib</groupId>-->