Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update MATSim version to 13.0 #9

Open
wants to merge 10 commits into
base: v1.1
Choose a base branch
from
Open

Update MATSim version to 13.0 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b9d80c9
change repo for matsim
tschlenther Sep 6, 2021
85f93d6
github workflows
tschlenther Sep 6, 2021
b4bc23b
update to matsim 13.0
tschlenther Sep 6, 2021
34dc454
delete pointer to old external drt-speed-up
tschlenther Sep 6, 2021
1af0136
update to matsim 13.0: drt config now includes fares and drt speed-up…
tschlenther Sep 6, 2021
2c433ba
Update pom.xml
rakow Sep 6, 2021
a0ab4a6
Update pom.xml
rakow Sep 6, 2021
33f8aa7
try to fix failing tests...
Sep 9, 2021
9089396
update drt configs
tschlenther Aug 3, 2023
09d5c35
update gtfs2matsim
tschlenther Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: build

on: [ push, pull_request ]

jobs:
build:
#run if push or pull_requests from fork
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository

runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
module:
- org.matsim.run.**

steps:
- uses: actions/checkout@v2
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 11
architecture: x64

- name: Cache Maven packages
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

- name: Test module
run: mvn -Dtest=${{matrix.module}} test --batch-mode -Dmatsim.preferLocalDtds=true -Dmaven.javadoc.skip -e

env:
MAVEN_OPTS: -Xmx10G
16 changes: 16 additions & 0 deletions .github/workflows/publish.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Publish package to GitHub Packages
on:
release:
types: [created]
jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
with:
java-version: 11
- name: Publish package
run: mvn --batch-mode deploy
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
56 changes: 37 additions & 19 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@
<description>MATSim open Los Angeles project</description>

<properties>
<!-- release> -->
<!--<matsim.version>11.0</matsim.version>-->
<!-- release -->
<matsim.version>13.0</matsim.version>

<!--weekly "release":-->
<matsim.version>12.0-2020w15-SNAPSHOT</matsim.version>
</properties>
<!-- PR-labelled release -->
<!--<matsim.version>14.0-PR1452</matsim.version>-->

<!-- snapshot == not recommended: rather use PR-labelled release!-->
<!-- <matsim.version>14.0-SNAPSHOT</matsim.version>-->
</properties>
<repositories>
<!--Note that in general repositories are not transitive, so they need to be repeated at every level where needed.-->
<repository>
Expand All @@ -33,7 +35,7 @@
<repository>
<!-- Repository for MATSim releases (MATSim is not on Maven central) -->
<id>matsim</id>
<url>https://dl.bintray.com/matsim/matsim</url>
<url>https://repo.matsim.org/repository/matsim</url>
</repository>
<repository>
<!-- Repository for MATSim snapshots: -->
Expand Down Expand Up @@ -64,11 +66,11 @@
<scope>compile</scope>
</dependency>

<dependency>
<groupId>com.github.matsim-vsp</groupId>
<artifactId>drt-speed-up</artifactId>
<version>v0.0.3</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.github.matsim-vsp</groupId>-->
<!-- <artifactId>drt-speed-up</artifactId>-->
<!-- <version>v0.0.3</version>-->
<!-- </dependency>-->

<dependency>
<!-- Include the JUnit testing library. Not transitive. -->
Expand Down Expand Up @@ -106,18 +108,34 @@
<type>jar</type>
<scope>compile</scope>
</dependency>

<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.5</version>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
</dependency>


<!-- <dependency>-->
<!-- <groupId>com.github.matsim-org</groupId>-->
<!-- <artifactId>GTFS2MATSim</artifactId>-->
<!-- <version>20cc145c34</version>-->
<!-- </dependency>-->

<dependency>
<groupId>com.github.matsim-org</groupId>
<artifactId>GTFS2MATSim</artifactId>
<version>20cc145c34</version>
<artifactId>gtfs2matsim</artifactId>
<version>master-33809c4f0f-1</version>
<exclusions>
<exclusion>
<groupId>org.matsim</groupId>
<artifactId>matsim</artifactId>
</exclusion>
<exclusion>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</exclusion>
</exclusions>
</dependency>

</dependencies>
Expand Down Expand Up @@ -147,7 +165,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19</version>
<version>2.22.2</version>
<configuration>
<excludes>
<exclude>**/*$*</exclude> <!-- exclude all inner classes -->
Expand Down
86 changes: 38 additions & 48 deletions scenarios/los-angeles-v1.1/input/drt/los-angeles-WSC-reduced-drt-v1.1-1pct.config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,14 +237,12 @@
</module>
<module name="multiModeDrt">
<parameterset type="drt">
<parameterset type="ExtensiveInsertionSearch"/>
<!-- If true, the startLink is changed to last link in the current schedule, so the taxi starts the next day at the link where it stopped operating the day before. False by default. -->
<param name="changeStartLinkToLastLinkInSchedule" value="true" />
<!-- allows to configure a service area per drt mode.Used with serviceArea Operational Scheme -->
<param name="drtServiceAreaShapeFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/us/los-angeles/los-angeles-v1.0/original-data/shp-data/WSC_Boundary_SCAG/WSC_Boundary_SCAG.shp" />
<!-- Beeline distance factor for DRT. Used in analyis and in plans file. The default value is 1.3. -->
<param name="estimatedBeelineDistanceFactor" value="1.3" />
<!-- Beeline-speed estimate for DRT. Used in analysis, optimisation constraints and in plans file, [m/s]. The default value is 25 km/h -->
<param name="estimatedDrtSpeed" value="8.333333333333334" />
<!-- Idle vehicles return to the nearest of all start links. See: DvrpVehicle.getStartLink() -->
<param name="idleVehiclesReturnToDepots" value="false" />
<!-- Defines the slope of the maxTravelTime estimation function (optimisation constraint), i.e. maxTravelTimeAlpha * estimated_drt_travel_time + maxTravelTimeBeta. Alpha should not be smaller than 1. -->
Expand Down Expand Up @@ -273,16 +271,31 @@
<param name="vehiclesFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/us/los-angeles/los-angeles-v1.0/input/drt/LA-WSC-drt1-10000veh_1seats.xml.gz" />
<!-- Writes out detailed DRT customer stats in each iteration. True by default. -->
<param name="writeDetailedCustomerStats" value="true" />
<parameterset type="drtSpeedUp" >
<param name="fractionOfIterationsSwitchOn" value="0.0" />
<param name="fractionOfIterationsSwitchOff" value="0.99" />
<param name="intervalDetailedIteration" value="10" />
<!-- <param name="numberOfThreadsForMobsimDuringSpeedUp" value="8" />-->
</parameterset>
<parameterset type="drtfare">
<!-- Basefare per Trip (fare = positive value) -->
<param name="basefare" value="0.0"/>
<!-- Minimum fare per trip (paid instead of the sum of base, time and distance fare if that sum would be lower than the minimum fare, fee = positive value). -->
<param name="minFarePerTrip" value="4.0"/>
<!-- Daily subscription fee (fee = positive value) -->
<param name="dailySubscriptionFee" value="0.0"/>
<!-- drt fare per meter (fee = positive value) -->
<param name="distanceFare_m" value="0.00035"/>
<!-- drt fare per hour (fee = positive value) -->
<param name="timeFare_h" value="0.0"/>
</parameterset>
</parameterset>
<parameterset type="drt">
<parameterset type="ExtensiveInsertionSearch"/>
<!-- If true, the startLink is changed to last link in the current schedule, so the taxi starts the next day at the link where it stopped operating the day before. False by default. -->
<param name="changeStartLinkToLastLinkInSchedule" value="true" />
<!-- allows to configure a service area per drt mode.Used with serviceArea Operational Scheme -->
<param name="drtServiceAreaShapeFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/us/los-angeles/los-angeles-v1.0/original-data/shp-data/WSC_Boundary_SCAG/WSC_Boundary_SCAG.shp" />
<!-- Beeline distance factor for DRT. Used in analyis and in plans file. The default value is 1.3. -->
<param name="estimatedBeelineDistanceFactor" value="1.3" />
<!-- Beeline-speed estimate for DRT. Used in analysis, optimisation constraints and in plans file, [m/s]. The default value is 25 km/h -->
<param name="estimatedDrtSpeed" value="8.333333333333334" />
<!-- Idle vehicles return to the nearest of all start links. See: DvrpVehicle.getStartLink() -->
<param name="idleVehiclesReturnToDepots" value="false" />
<!-- Defines the slope of the maxTravelTime estimation function (optimisation constraint), i.e. maxTravelTimeAlpha * estimated_drt_travel_time + maxTravelTimeBeta. Alpha should not be smaller than 1. -->
Expand Down Expand Up @@ -311,6 +324,24 @@
<param name="vehiclesFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/us/los-angeles/los-angeles-v1.0/input/drt/LA-WSC-drt2-10000veh_4seats.xml.gz" />
<!-- Writes out detailed DRT customer stats in each iteration. True by default. -->
<param name="writeDetailedCustomerStats" value="true" />
<parameterset type="drtSpeedUp" >
<param name="fractionOfIterationsSwitchOn" value="0.0" />
<param name="fractionOfIterationsSwitchOff" value="0.99" />
<param name="intervalDetailedIteration" value="10" />
<!-- <param name="numberOfThreadsForMobsimDuringSpeedUp" value="8" />-->
</parameterset>
<parameterset type="drtfare">
<!-- Basefare per Trip (fare = positive value) -->
<param name="basefare" value="0.0"/>
<!-- Minimum fare per trip (paid instead of the sum of base, time and distance fare if that sum would be lower than the minimum fare, fee = positive value). -->
<param name="minFarePerTrip" value="2.0"/>
<!-- Daily subscription fee (fee = positive value) -->
<param name="dailySubscriptionFee" value="0.0"/>
<!-- drt fare per meter (fee = positive value) -->
<param name="distanceFare_m" value="0.0001"/>
<!-- drt fare per hour (fee = positive value) -->
<param name="timeFare_h" value="0.0"/>
</parameterset>
</parameterset>
</module>

Expand All @@ -324,46 +355,5 @@
<!-- Used for ONLINE estimation of travel times for VrpOptimizer by combining WithinDayTravelTime and DvrpOfflineTravelTimeEstimator. The beta coefficient is provided in seconds and should be either 0 (no online estimation) or positive (mixed online-offline estimation). For 'beta = 0', only the offline estimate is used: 'onlineTT(t) = offlineTT(t)', where 'offlineTT(t)' in the offline estimate for TT at time 't', For 'beta > 0', estimating future TTs at time 't', uses the currently observed TT to correct the offline estimates is made: where 'currentTT' is the currently observed TT, and 'correction = min(1, max(0, 1 - (time - currentTime) / beta))' The rule is that correction decreases linearly from 1 (when 'time = currentTime') to 0 (when 'time = currentTime + beta' For 'time > currentTime + beta' correction is 0, whereas if 'time < currentTime' it is 1. If beta is sufficiently large, 'beta >> 0', only the currently observed TT is used. -->
<param name="travelTimeEstimationBeta" value="0.0" />
</module>

<module name="drtfares">
<!-- Define a parameterset for each drt mode where fares should be charged -->

<parameterset type="drtfare">
<!-- transport mode for which this fare applies. Default: drt -->
<param name="mode" value="drt1"/>
<!-- Basefare per Trip (fare = positive value) -->
<param name="basefare" value="0.0"/>
<!-- Minimum fare per trip (paid instead of the sum of base, time and distance fare if that sum would be lower than the minimum fare, fee = positive value). -->
<param name="minFarePerTrip" value="4.0"/>
<!-- Daily subscription fee (fee = positive value) -->
<param name="dailySubscriptionFee" value="0.0"/>
<!-- drt fare per meter (fee = positive value) -->
<param name="distanceFare_m" value="0.00035"/>
<!-- drt fare per hour (fee = positive value) -->
<param name="timeFare_h" value="0.0"/>
</parameterset>

<parameterset type="drtfare">
<!-- transport mode for which this fare applies. Default: drt -->
<param name="mode" value="drt2"/>
<!-- Basefare per Trip (fare = positive value) -->
<param name="basefare" value="0.0"/>
<!-- Minimum fare per trip (paid instead of the sum of base, time and distance fare if that sum would be lower than the minimum fare, fee = positive value). -->
<param name="minFarePerTrip" value="2.0"/>
<!-- Daily subscription fee (fee = positive value) -->
<param name="dailySubscriptionFee" value="0.0"/>
<!-- drt fare per meter (fee = positive value) -->
<param name="distanceFare_m" value="0.0001"/>
<!-- drt fare per hour (fee = positive value) -->
<param name="timeFare_h" value="0.0"/>
</parameterset>
</module>

<module name="drtSpeedUp" >
<param name="fractionOfIterationSwitchOn" value="0.0" />
<param name="fractionOfIterationsSwitchOff" value="0.99" />
<param name="intervalDetailedIteration" value="10" />
<param name="numberOfThreadsForMobsimDuringSpeedUp" value="8" />
<param name="modes" value="drt1,drt2" />
</module>
</config>
77 changes: 36 additions & 41 deletions scenarios/los-angeles-v1.1/input/drt/los-angeles-drt-v1.1-1pct.config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,24 @@
<param name="vehiclesFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/us/los-angeles/los-angeles-v1.0/input/drt/LA-WSC-drt1-10000veh_1seats.xml.gz" />
<!-- Writes out detailed DRT customer stats in each iteration. True by default. -->
<param name="writeDetailedCustomerStats" value="true" />
<parameterset type="drtSpeedUp" >
<param name="fractionOfIterationsSwitchOn" value="0.0" />
<param name="fractionOfIterationsSwitchOff" value="0.99" />
<param name="intervalDetailedIteration" value="10" />
<!-- <param name="numberOfThreadsForMobsimDuringSpeedUp" value="8" />-->
</parameterset>
<parameterset type="drtfare">
<!-- Basefare per Trip (fare = positive value) -->
<param name="basefare" value="0.0"/>
<!-- Minimum fare per trip (paid instead of the sum of base, time and distance fare if that sum would be lower than the minimum fare, fee = positive value). -->
<param name="minFarePerTrip" value="4.0"/>
<!-- Daily subscription fee (fee = positive value) -->
<param name="dailySubscriptionFee" value="0.0"/>
<!-- drt fare per meter (fee = positive value) -->
<param name="distanceFare_m" value="0.00035"/>
<!-- drt fare per hour (fee = positive value) -->
<param name="timeFare_h" value="0.0"/>
</parameterset>
</parameterset>
<parameterset type="drt">
<!-- If true, the startLink is changed to last link in the current schedule, so the taxi starts the next day at the link where it stopped operating the day before. False by default. -->
Expand Down Expand Up @@ -311,6 +329,24 @@
<param name="vehiclesFile" value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/us/los-angeles/los-angeles-v1.0/input/drt/LA-WSC-drt2-10000veh_4seats.xml.gz" />
<!-- Writes out detailed DRT customer stats in each iteration. True by default. -->
<param name="writeDetailedCustomerStats" value="true" />
<parameterset type="drtSpeedUp" >
<param name="fractionOfIterationsSwitchOn" value="0.0" />
<param name="fractionOfIterationsSwitchOff" value="0.99" />
<param name="intervalDetailedIteration" value="10" />
<!-- <param name="numberOfThreadsForMobsimDuringSpeedUp" value="8" />-->
</parameterset>
<parameterset type="drtfare">
<!-- Basefare per Trip (fare = positive value) -->
<param name="basefare" value="0.0"/>
<!-- Minimum fare per trip (paid instead of the sum of base, time and distance fare if that sum would be lower than the minimum fare, fee = positive value). -->
<param name="minFarePerTrip" value="2.0"/>
<!-- Daily subscription fee (fee = positive value) -->
<param name="dailySubscriptionFee" value="0.0"/>
<!-- drt fare per meter (fee = positive value) -->
<param name="distanceFare_m" value="0.0001"/>
<!-- drt fare per hour (fee = positive value) -->
<param name="timeFare_h" value="0.0"/>
</parameterset>
</parameterset>
</module>

Expand All @@ -324,46 +360,5 @@
<!-- Used for ONLINE estimation of travel times for VrpOptimizer by combining WithinDayTravelTime and DvrpOfflineTravelTimeEstimator. The beta coefficient is provided in seconds and should be either 0 (no online estimation) or positive (mixed online-offline estimation). For 'beta = 0', only the offline estimate is used: 'onlineTT(t) = offlineTT(t)', where 'offlineTT(t)' in the offline estimate for TT at time 't', For 'beta > 0', estimating future TTs at time 't', uses the currently observed TT to correct the offline estimates is made: where 'currentTT' is the currently observed TT, and 'correction = min(1, max(0, 1 - (time - currentTime) / beta))' The rule is that correction decreases linearly from 1 (when 'time = currentTime') to 0 (when 'time = currentTime + beta' For 'time > currentTime + beta' correction is 0, whereas if 'time < currentTime' it is 1. If beta is sufficiently large, 'beta >> 0', only the currently observed TT is used. -->
<param name="travelTimeEstimationBeta" value="0.0" />
</module>

<module name="drtfares">
<!-- Define a parameterset for each drt mode where fares should be charged -->

<parameterset type="drtfare">
<!-- transport mode for which this fare applies. Default: drt -->
<param name="mode" value="drt1"/>
<!-- Basefare per Trip (fare = positive value) -->
<param name="basefare" value="0.0"/>
<!-- Minimum fare per trip (paid instead of the sum of base, time and distance fare if that sum would be lower than the minimum fare, fee = positive value). -->
<param name="minFarePerTrip" value="4.0"/>
<!-- Daily subscription fee (fee = positive value) -->
<param name="dailySubscriptionFee" value="0.0"/>
<!-- drt fare per meter (fee = positive value) -->
<param name="distanceFare_m" value="0.00035"/>
<!-- drt fare per hour (fee = positive value) -->
<param name="timeFare_h" value="0.0"/>
</parameterset>

<parameterset type="drtfare">
<!-- transport mode for which this fare applies. Default: drt -->
<param name="mode" value="drt2"/>
<!-- Basefare per Trip (fare = positive value) -->
<param name="basefare" value="0.0"/>
<!-- Minimum fare per trip (paid instead of the sum of base, time and distance fare if that sum would be lower than the minimum fare, fee = positive value). -->
<param name="minFarePerTrip" value="2.0"/>
<!-- Daily subscription fee (fee = positive value) -->
<param name="dailySubscriptionFee" value="0.0"/>
<!-- drt fare per meter (fee = positive value) -->
<param name="distanceFare_m" value="0.0001"/>
<!-- drt fare per hour (fee = positive value) -->
<param name="timeFare_h" value="0.0"/>
</parameterset>
</module>

<module name="drtSpeedUp" >
<param name="fractionOfIterationSwitchOn" value="0.0" />
<param name="fractionOfIterationsSwitchOff" value="0.99" />
<param name="intervalDetailedIteration" value="10" />
<param name="numberOfThreadsForMobsimDuringSpeedUp" value="8" />
<param name="modes" value="drt1,drt2" />
</module>
</config>
Loading