From b9d80c9ebbede09a2da5f8bb0f3f8ea6abe5db39 Mon Sep 17 00:00:00 2001 From: tschlenther Date: Mon, 6 Sep 2021 12:44:25 +0200 Subject: [PATCH 01/10] change repo for matsim --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e926e35..9e283c3 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ matsim - https://dl.bintray.com/matsim/matsim + https://repo.matsim.org/repository/matsim From 85f93d61ff8d5ec3f18bb57fbf8738131ff07b85 Mon Sep 17 00:00:00 2001 From: tschlenther Date: Mon, 6 Sep 2021 12:49:32 +0200 Subject: [PATCH 02/10] github workflows --- .github/workflows/build.yaml | 37 ++++++++++++++++++++++++++++++++++ .github/workflows/publish.yaml | 16 +++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 .github/workflows/build.yaml create mode 100644 .github/workflows/publish.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 0000000..f3bbaf5 --- /dev/null +++ b/.github/workflows/build.yaml @@ -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 \ No newline at end of file diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml new file mode 100644 index 0000000..9a2a316 --- /dev/null +++ b/.github/workflows/publish.yaml @@ -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 }} \ No newline at end of file From b4bc23be055aec5499842026e6b8e971b4dbe7d0 Mon Sep 17 00:00:00 2001 From: tschlenther Date: Mon, 6 Sep 2021 13:00:11 +0200 Subject: [PATCH 03/10] update to matsim 13.0 --- pom.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 9e283c3..4b20883 100644 --- a/pom.xml +++ b/pom.xml @@ -10,11 +10,14 @@ MATSim open Los Angeles project - - + + 13.0 - - 12.0-2020w15-SNAPSHOT + + + + + From 34dc4544f0975a47f603380075f30a5062fba983 Mon Sep 17 00:00:00 2001 From: tschlenther Date: Mon, 6 Sep 2021 14:23:22 +0200 Subject: [PATCH 04/10] delete pointer to old external drt-speed-up --- pom.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 4b20883..5dee77c 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,6 @@ - @@ -67,11 +66,11 @@ compile - - com.github.matsim-vsp - drt-speed-up - v0.0.3 - + + + + + From 1af013632eba0328b724a5ccdd445a099ccd007b Mon Sep 17 00:00:00 2001 From: tschlenther Date: Mon, 6 Sep 2021 14:56:53 +0200 Subject: [PATCH 05/10] update to matsim 13.0: drt config now includes fares and drt speed-up params. Activities use OptionalTime --- .../org/matsim/prepare/MergeTransitFiles.java | 4 +- ...hPersonSpecificMarginalUtilityOfMoney.java | 7 ++-- .../LosAngelesPlanScoringFunctionFactory.java | 21 ++++++----- ...osAngelesRaptorIntermodalAccessEgress.java | 37 +++++++++---------- ...ActivityTypeOpeningIntervalCalculator.java | 9 +++-- .../org/matsim/run/RunLosAngelesScenario.java | 3 +- .../run/drt/RunDrtLosAngelesScenario.java | 13 +------ 7 files changed, 44 insertions(+), 50 deletions(-) diff --git a/src/main/java/org/matsim/prepare/MergeTransitFiles.java b/src/main/java/org/matsim/prepare/MergeTransitFiles.java index 5e612dd..08eacef 100644 --- a/src/main/java/org/matsim/prepare/MergeTransitFiles.java +++ b/src/main/java/org/matsim/prepare/MergeTransitFiles.java @@ -180,7 +180,9 @@ public static void mergeSchedule(final TransitSchedule baseSchedule, final Strin for (TransitRouteStop routeStop : route.getStops()) { Id newFacilityId = Id.create(id + "_" + routeStop.getStopFacility().getId(), TransitStopFacility.class); TransitStopFacility stop = baseSchedule.getFacilities().get(newFacilityId); - stopsWithNewIDs.add(baseSchedule.getFactory().createTransitRouteStop(stop , routeStop.getArrivalOffset(), routeStop.getDepartureOffset())); + stopsWithNewIDs.add(baseSchedule.getFactory().createTransitRouteStop(stop , + routeStop.getArrivalOffset().orElseThrow(() -> new IllegalArgumentException("")), + routeStop.getDepartureOffset().orElseThrow(() -> new IllegalArgumentException("")))); } TransitRoute route2 = baseSchedule.getFactory().createTransitRoute(route.getId(), route.getRoute(), stopsWithNewIDs, route.getTransportMode()); diff --git a/src/main/java/org/matsim/run/CharyparNagelLegScoringWithPersonSpecificMarginalUtilityOfMoney.java b/src/main/java/org/matsim/run/CharyparNagelLegScoringWithPersonSpecificMarginalUtilityOfMoney.java index 4382406..4208793 100644 --- a/src/main/java/org/matsim/run/CharyparNagelLegScoringWithPersonSpecificMarginalUtilityOfMoney.java +++ b/src/main/java/org/matsim/run/CharyparNagelLegScoringWithPersonSpecificMarginalUtilityOfMoney.java @@ -32,6 +32,7 @@ import org.matsim.core.gbl.Gbl; import org.matsim.core.scoring.functions.ModeUtilityParameters; import org.matsim.core.scoring.functions.ScoringParameters; +import org.matsim.core.utils.misc.OptionalTime; import org.matsim.core.utils.misc.Time; import org.matsim.pt.PtConstants; @@ -58,7 +59,7 @@ public class CharyparNagelLegScoringWithPersonSpecificMarginalUtilityOfMoney imp private boolean nextEnterVehicleIsFirstOfTrip = true; private boolean nextStartPtLegIsFirstOfTrip = true; private boolean currentLegIsPtLeg = false; - private double lastActivityEndTime = Time.getUndefinedTime(); + private OptionalTime lastActivityEndTime = OptionalTime.undefined(); private final Set ptModes; private final Set modesAlreadyConsideredForDailyConstants = new HashSet<>(); private final double marginalUtilityOfMoney; @@ -154,7 +155,7 @@ public void handleEvent(Event event) { this.nextEnterVehicleIsFirstOfTrip = true ; this.nextStartPtLegIsFirstOfTrip = true ; } - this.lastActivityEndTime = event.getTime() ; + this.lastActivityEndTime = OptionalTime.defined(event.getTime()) ; } if ( event instanceof PersonEntersVehicleEvent && currentLegIsPtLeg ) { @@ -164,7 +165,7 @@ public void handleEvent(Event event) { } this.nextEnterVehicleIsFirstOfTrip = false ; // add score of waiting, _minus_ score of travelling (since it is added in the legscoring above): - this.score += (event.getTime() - this.lastActivityEndTime) * (this.params.marginalUtilityOfWaitingPt_s - this.params.modeParams.get(TransportMode.pt).marginalUtilityOfTraveling_s) ; + this.score += (event.getTime() - this.lastActivityEndTime.seconds()) * (this.params.marginalUtilityOfWaitingPt_s - this.params.modeParams.get(TransportMode.pt).marginalUtilityOfTraveling_s) ; } if ( event instanceof PersonDepartureEvent ) { diff --git a/src/main/java/org/matsim/run/LosAngelesPlanScoringFunctionFactory.java b/src/main/java/org/matsim/run/LosAngelesPlanScoringFunctionFactory.java index c1be796..07d3403 100644 --- a/src/main/java/org/matsim/run/LosAngelesPlanScoringFunctionFactory.java +++ b/src/main/java/org/matsim/run/LosAngelesPlanScoringFunctionFactory.java @@ -42,6 +42,7 @@ import org.matsim.core.scoring.functions.ScoringParameters; import org.matsim.core.scoring.functions.ScoringParametersForPerson; import org.matsim.core.scoring.functions.SubpopulationScoringParameters; +import org.matsim.core.utils.misc.OptionalTime; /** * @author ikaddoura @@ -76,8 +77,8 @@ public ScoringFunction createNewScoringFunction(Person person) { SumScoringFunction sumScoringFunction = new SumScoringFunction(); - Map type2minOpenTime = new HashMap<>(); - Map type2maxClosingTime = new HashMap<>(); + Map type2minOpenTime = new HashMap<>(); + Map type2maxClosingTime = new HashMap<>(); Set baseTypes = new HashSet<>(); // get the earliest opening time and latest closing time for each person and each (base) activity type @@ -90,29 +91,29 @@ public ScoringFunction createNewScoringFunction(Person person) { if (act.getAttributes().getAttribute("initialStartTime") != null) { double startTime = (double) act.getAttributes().getAttribute("initialStartTime"); if (type2minOpenTime.get(baseType) == null) { - type2minOpenTime.put(baseType, startTime); + type2minOpenTime.put(baseType, OptionalTime.defined(startTime)); } else { - if (type2minOpenTime.get(baseType) > startTime) { - type2minOpenTime.put(baseType, startTime); + if (type2minOpenTime.get(baseType).seconds() > startTime) { + type2minOpenTime.put(baseType, OptionalTime.defined(startTime)); } } } if (act.getAttributes().getAttribute("initialEndTime") != null) { double endTime = (double) act.getAttributes().getAttribute("initialEndTime"); if (type2maxClosingTime.get(baseType) == null) { - type2maxClosingTime.put(baseType, endTime); + type2maxClosingTime.put(baseType, OptionalTime.defined(endTime)); } else { - if (type2maxClosingTime.get(baseType) < endTime) { - type2maxClosingTime.put(baseType, endTime); + if (type2maxClosingTime.get(baseType).seconds() < endTime) { + type2maxClosingTime.put(baseType, OptionalTime.defined(endTime)); } } } } } - Map baseType2openingInterval = new HashMap<>(); + Map baseType2openingInterval = new HashMap<>(); for (String actType : baseTypes ) { - baseType2openingInterval.put(actType, new double[]{type2minOpenTime.getOrDefault(actType, -1.), type2maxClosingTime.getOrDefault(actType, -1.)}); + baseType2openingInterval.put(actType, new OptionalTime[]{type2minOpenTime.getOrDefault(actType, OptionalTime.undefined()), type2maxClosingTime.getOrDefault(actType, OptionalTime.undefined())}); } sumScoringFunction.addScoringFunction(new CharyparNagelActivityScoring( parameters, new PersonSpecificActivityTypeOpeningIntervalCalculator(baseType2openingInterval))); diff --git a/src/main/java/org/matsim/run/LosAngelesRaptorIntermodalAccessEgress.java b/src/main/java/org/matsim/run/LosAngelesRaptorIntermodalAccessEgress.java index 039c3f2..d16ab55 100644 --- a/src/main/java/org/matsim/run/LosAngelesRaptorIntermodalAccessEgress.java +++ b/src/main/java/org/matsim/run/LosAngelesRaptorIntermodalAccessEgress.java @@ -10,13 +10,12 @@ import org.matsim.api.core.v01.population.Leg; import org.matsim.api.core.v01.population.Person; import org.matsim.api.core.v01.population.PlanElement; -import org.matsim.contrib.av.robotaxi.fares.drt.DrtFareConfigGroup; -import org.matsim.contrib.av.robotaxi.fares.drt.DrtFaresConfigGroup; +import org.matsim.contrib.drt.fare.DrtFareParams; +import org.matsim.contrib.drt.run.DrtConfigGroup; import org.matsim.core.config.Config; -import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.PlanCalcScoreConfigGroup.ScoringParameterSet; import org.matsim.core.gbl.MatsimRandom; -import org.matsim.core.utils.misc.Time; +import org.matsim.core.utils.misc.OptionalTime; import com.google.inject.Inject; @@ -30,14 +29,14 @@ public class LosAngelesRaptorIntermodalAccessEgress implements RaptorIntermodalAccessEgress { Config config; - DrtFaresConfigGroup drtFaresConfigGroup; + DrtConfigGroup drtConfigGroup; Random random = MatsimRandom.getLocalInstance(); @Inject - LosAngelesRaptorIntermodalAccessEgress(Config config) { + LosAngelesRaptorIntermodalAccessEgress(Config config, DrtConfigGroup drtConfigGroup) { this.config = config; - this.drtFaresConfigGroup = ConfigUtils.addOrGetModule(config, DrtFaresConfigGroup.class); + this.drtConfigGroup = drtConfigGroup; } @Override @@ -60,12 +59,12 @@ public RIntermodalAccessEgress calcIntermodalAccessEgress(final List baseType2openingInterval; + private final Map baseType2openingInterval; - public PersonSpecificActivityTypeOpeningIntervalCalculator(Map baseType2openingInterval) { + public PersonSpecificActivityTypeOpeningIntervalCalculator(Map baseType2openingInterval) { this.baseType2openingInterval = baseType2openingInterval; } @Override - public double[] getOpeningInterval(final Activity act) { + public OptionalTime[] getOpeningInterval(final Activity act) { String baseActivityType = act.getType().split("_")[0]; if (baseActivityType.equals("home")) { // home activities should not have an opening or closing time - return new double[]{-1., -1.}; + return new OptionalTime[]{OptionalTime.undefined(), OptionalTime.undefined()}; } else { diff --git a/src/main/java/org/matsim/run/RunLosAngelesScenario.java b/src/main/java/org/matsim/run/RunLosAngelesScenario.java index 7150449..5903046 100644 --- a/src/main/java/org/matsim/run/RunLosAngelesScenario.java +++ b/src/main/java/org/matsim/run/RunLosAngelesScenario.java @@ -30,6 +30,7 @@ import org.matsim.core.config.ConfigGroup; import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.PlanCalcScoreConfigGroup.ActivityParams; +import org.matsim.core.config.groups.PlansCalcRouteConfigGroup; import org.matsim.core.config.groups.QSimConfigGroup.TrafficDynamics; import org.matsim.core.config.groups.VspExperimentalConfigGroup; import org.matsim.core.controler.AbstractModule; @@ -183,7 +184,7 @@ public static Config prepareConfig(String [] args, ConfigGroup... customModules) // vsp defaults config.vspExperimental().setVspDefaultsCheckingLevel( VspExperimentalConfigGroup.VspDefaultsCheckingLevel.abort ); - config.plansCalcRoute().setInsertingAccessEgressWalk( true ); + config.plansCalcRoute().setAccessEgressType( PlansCalcRouteConfigGroup.AccessEgressType.accessEgressModeToLink ); config.qsim().setUsingTravelTimeCheckInTeleportation( true ); config.qsim().setTrafficDynamics( TrafficDynamics.kinematicWaves ); diff --git a/src/main/java/org/matsim/run/drt/RunDrtLosAngelesScenario.java b/src/main/java/org/matsim/run/drt/RunDrtLosAngelesScenario.java index 35caec6..95d23c8 100644 --- a/src/main/java/org/matsim/run/drt/RunDrtLosAngelesScenario.java +++ b/src/main/java/org/matsim/run/drt/RunDrtLosAngelesScenario.java @@ -21,8 +21,6 @@ import org.apache.log4j.Logger; import org.matsim.api.core.v01.Scenario; -import org.matsim.contrib.av.robotaxi.fares.drt.DrtFareModule; -import org.matsim.contrib.av.robotaxi.fares.drt.DrtFaresConfigGroup; import org.matsim.contrib.drt.routing.DrtRoute; import org.matsim.contrib.drt.routing.DrtRouteFactory; import org.matsim.contrib.drt.run.DrtConfigGroup; @@ -39,8 +37,6 @@ import org.matsim.core.population.routes.RouteFactories; import org.matsim.core.router.AnalysisMainModeIdentifier; import org.matsim.core.router.MainModeIdentifier; -import org.matsim.drtSpeedUp.DrtSpeedUpConfigGroup; -import org.matsim.drtSpeedUp.DrtSpeedUpModule; import org.matsim.run.LosAngelesIntermodalPtDrtRouterAnalysisModeIdentifier; import org.matsim.run.LosAngelesIntermodalPtDrtRouterModeIdentifier; import org.matsim.run.RunLosAngelesScenario; @@ -84,12 +80,6 @@ public static Controler prepareControler( Scenario scenario ) { controler.addOverridingModule(new DvrpModule()); controler.configureQSimComponents(DvrpQSimComponents.activateAllModes(MultiModeDrtConfigGroup.get(controler.getConfig()))); - // Add drt-specific fare module - controler.addOverridingModule(new DrtFareModule()); - - // Add the drt-speed-up module - controler.addOverridingModule(new DrtSpeedUpModule()); - controler.addOverridingModule(new AbstractModule() { @Override @@ -127,10 +117,9 @@ public static Scenario prepareScenario( Config config ) { } public static Config prepareConfig(String [] args) { - Config config = RunLosAngelesScenario.prepareConfig(args, new MultiModeDrtConfigGroup(), new DvrpConfigGroup(), new DrtFaresConfigGroup(), new DrtSpeedUpConfigGroup() ) ; + Config config = RunLosAngelesScenario.prepareConfig(args, new MultiModeDrtConfigGroup(), new DvrpConfigGroup()) ; DrtConfigs.adjustMultiModeDrtConfig(MultiModeDrtConfigGroup.get(config), config.planCalcScore(), config.plansCalcRoute()); - DrtSpeedUpModule.addTeleportedDrtMode(config); return config ; } From 2c433ba268ccc606b7b4e6cfbb4d79b80983f0b3 Mon Sep 17 00:00:00 2001 From: rakow Date: Mon, 6 Sep 2021 16:03:56 +0200 Subject: [PATCH 06/10] Update pom.xml update surefire --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5dee77c..2fcd55e 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.19 + 2.22.2 **/*$* From a0ab4a62632b86383708bb76853649bb5b1f0d17 Mon Sep 17 00:00:00 2001 From: rakow Date: Mon, 6 Sep 2021 16:04:45 +0200 Subject: [PATCH 07/10] Update pom.xml update commons-io --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2fcd55e..83627bd 100644 --- a/pom.xml +++ b/pom.xml @@ -112,8 +112,8 @@ commons-io - commons-io - 2.5 + commons-io + 2.7 From 33f8aa71387664fdcbdf7e97bd408e86d7cc708f Mon Sep 17 00:00:00 2001 From: u234825 Date: Fri, 10 Sep 2021 01:25:33 +0200 Subject: [PATCH 08/10] try to fix failing tests... --- .../matsim/run/LosAngelesRaptorIntermodalAccessEgress.java | 7 ++++--- src/main/java/org/matsim/run/RunLosAngelesScenario.java | 2 +- .../java/org/matsim/run/RunLosAngelesScenarioTest.java | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/matsim/run/LosAngelesRaptorIntermodalAccessEgress.java b/src/main/java/org/matsim/run/LosAngelesRaptorIntermodalAccessEgress.java index d16ab55..c618350 100644 --- a/src/main/java/org/matsim/run/LosAngelesRaptorIntermodalAccessEgress.java +++ b/src/main/java/org/matsim/run/LosAngelesRaptorIntermodalAccessEgress.java @@ -13,6 +13,7 @@ import org.matsim.contrib.drt.fare.DrtFareParams; import org.matsim.contrib.drt.run.DrtConfigGroup; import org.matsim.core.config.Config; +import org.matsim.core.config.ConfigUtils; import org.matsim.core.config.groups.PlanCalcScoreConfigGroup.ScoringParameterSet; import org.matsim.core.gbl.MatsimRandom; import org.matsim.core.utils.misc.OptionalTime; @@ -34,9 +35,9 @@ public class LosAngelesRaptorIntermodalAccessEgress implements RaptorIntermodalA Random random = MatsimRandom.getLocalInstance(); @Inject - LosAngelesRaptorIntermodalAccessEgress(Config config, DrtConfigGroup drtConfigGroup) { + LosAngelesRaptorIntermodalAccessEgress(Config config) { this.config = config; - this.drtConfigGroup = drtConfigGroup; + drtConfigGroup = ConfigUtils.addOrGetModule(config, DrtConfigGroup.class); } @Override @@ -75,7 +76,7 @@ public RIntermodalAccessEgress calcIntermodalAccessEgress(final List Date: Thu, 3 Aug 2023 13:53:02 +0200 Subject: [PATCH 09/10] update drt configs --- ...geles-WSC-reduced-drt-v1.1-1pct.config.xml | 86 ++++++++----------- .../drt/los-angeles-drt-v1.1-1pct.config.xml | 77 ++++++++--------- 2 files changed, 74 insertions(+), 89 deletions(-) diff --git a/scenarios/los-angeles-v1.1/input/drt/los-angeles-WSC-reduced-drt-v1.1-1pct.config.xml b/scenarios/los-angeles-v1.1/input/drt/los-angeles-WSC-reduced-drt-v1.1-1pct.config.xml index 8448eb6..0456f73 100644 --- a/scenarios/los-angeles-v1.1/input/drt/los-angeles-WSC-reduced-drt-v1.1-1pct.config.xml +++ b/scenarios/los-angeles-v1.1/input/drt/los-angeles-WSC-reduced-drt-v1.1-1pct.config.xml @@ -237,14 +237,12 @@ + - - - @@ -273,16 +271,31 @@ + + + + + + + + + + + + + + + + + + + - - - - @@ -311,6 +324,24 @@ + + + + + + + + + + + + + + + + + + @@ -324,46 +355,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/scenarios/los-angeles-v1.1/input/drt/los-angeles-drt-v1.1-1pct.config.xml b/scenarios/los-angeles-v1.1/input/drt/los-angeles-drt-v1.1-1pct.config.xml index 1c277eb..160b31b 100644 --- a/scenarios/los-angeles-v1.1/input/drt/los-angeles-drt-v1.1-1pct.config.xml +++ b/scenarios/los-angeles-v1.1/input/drt/los-angeles-drt-v1.1-1pct.config.xml @@ -273,6 +273,24 @@ + + + + + + + + + + + + + + + + + + @@ -311,6 +329,24 @@ + + + + + + + + + + + + + + + + + + @@ -324,46 +360,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 09d5c35daf279ea1262e8455b32bf0e0662feeea Mon Sep 17 00:00:00 2001 From: tschlenther Date: Thu, 3 Aug 2023 14:02:55 +0200 Subject: [PATCH 10/10] update gtfs2matsim --- pom.xml | 30 ++++++++++++++----- .../run/drt/RunDrtLosAngelesScenario.java | 2 +- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 83627bd..e5fb48e 100644 --- a/pom.xml +++ b/pom.xml @@ -108,18 +108,34 @@ jar compile - + - commons-io - commons-io - 2.7 + commons-io + commons-io + 2.7 - + + + + + + + com.github.matsim-org - GTFS2MATSim - 20cc145c34 + gtfs2matsim + master-33809c4f0f-1 + + + org.matsim + matsim + + + org.postgresql + postgresql + + diff --git a/src/main/java/org/matsim/run/drt/RunDrtLosAngelesScenario.java b/src/main/java/org/matsim/run/drt/RunDrtLosAngelesScenario.java index 95d23c8..022f789 100644 --- a/src/main/java/org/matsim/run/drt/RunDrtLosAngelesScenario.java +++ b/src/main/java/org/matsim/run/drt/RunDrtLosAngelesScenario.java @@ -87,7 +87,7 @@ public void install() { // use a main mode identifier which knows how to handle intermodal trips generated by the used sbb pt raptor router // the SwissRailRaptor already binds its IntermodalAwareRouterModeIdentifier, however drt obviuosly replaces it // with its own implementation - // So we need our own main mode indentifier which replaces both :-( + // So we need our own main mode identifier which replaces both :-( bind(MainModeIdentifier.class).to(LosAngelesIntermodalPtDrtRouterModeIdentifier.class); bind(AnalysisMainModeIdentifier.class).to(LosAngelesIntermodalPtDrtRouterAnalysisModeIdentifier.class); }