update gtfs2matsim, fix make file

matsim-scenarios · Dec 14, 2024 · 89be99b · 89be99b
1 parent 0994fbf
commit 89be99b
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -135,7 +135,7 @@ $p/berlin-$V-network-with-pt.xml.gz: $p/berlin-$V-network.xml.gz
  	  --network $p/berlin-$V-network-with-pt.xml.gz\
  	  --transit-schedule $p/berlin-$V-transitSchedule.xml.gz\
  	  --transit-vehicles $p/berlin-$V-transitVehicles.xml.gz\
- 	  --output-transit-schedule $p/berlin-$V-transitSchedule-endless-circle-line.xml.gz
+ 	  --output-transit-schedule $p/berlin-$V-transitSchedule-endless-circle-line.xml.gz\
 	  --output-transit-vehicles $p/berlin-$V-transitVehicles-endless-circle-line.xml.gz
 
 $p/berlin-$V-counts-vmz.xml.gz: $p/berlin-$V-network.xml.gz
@@ -356,4 +356,6 @@ prepare-drt: $p/berlin-$V.drt-by-rndLocations-10000vehicles-4seats.xml.gz
 	echo "Done"
 
 prepare: $p/berlin-$V-10pct.plans.xml.gz
-	echo "Done"
+	echo "Done"
+
+prepare-schedule: $p/berlin-$V-network-with-pt.xml.gz
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 		<artifactId>matsim-all</artifactId>
 
 		<!-- PR-labelled release -->
-		<version>2025.0-PR3628</version>
+		<version>2025.0-PR3637</version>
 
 		<!-- snapshot == not recommended: rather use PR-labelled release!-->
 <!--		<version>2025.0-SNAPSHOT</version>-->
@@ -128,7 +128,7 @@
 		<dependency>
 			<groupId>com.github.matsim-org</groupId>
 			<artifactId>gtfs2matsim</artifactId>
-			<version>19f1676fc6</version>
+			<version>5b5f6abf6e</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.matsim</groupId>

diff --git a/src/main/java/org/matsim/prepare/RunOpenBerlinCalibration.java b/src/main/java/org/matsim/prepare/RunOpenBerlinCalibration.java
@@ -62,6 +62,7 @@
 import org.matsim.prepare.opt.RunCountOptimization;
 import org.matsim.prepare.opt.SelectPlansFromIndex;
 import org.matsim.prepare.population.*;
+import org.matsim.prepare.transit.EndlessCircleLineScheduleModifier;
 import org.matsim.run.Activities;
 import org.matsim.run.OpenBerlinScenario;
 import org.matsim.run.scoring.AdvancedScoringConfigGroup;
@@ -94,7 +95,7 @@
 	GenerateSmallScaleCommercialTrafficDemand.class, CreateDataDistributionOfStructureData.class,
 	RunCountOptimization.class, SelectPlansFromIndex.class, ExtractPlanIndexFromType.class, AssignReferencePopulation.class,
 	ExtractRelevantFreightTrips.class, CheckCarAvailability.class, FixSubtourModes.class, ComputeTripChoices.class, ComputePlanChoices.class,
-	ApplyNetworkParams.class, SetCarAvailabilityByAge.class, CreateDrtVehicles.class
+	ApplyNetworkParams.class, SetCarAvailabilityByAge.class, CreateDrtVehicles.class, EndlessCircleLineScheduleModifier.class
 })
 public class RunOpenBerlinCalibration extends MATSimApplication {
 

diff --git a/src/main/java/org/matsim/prepare/transit/EndlessCircleLineScheduleModifier.java b/src/main/java/org/matsim/prepare/transit/EndlessCircleLineScheduleModifier.java
@@ -1,3 +1,22 @@
+/* *********************************************************************** *
+ * project: org.matsim.*
+ *                                                                         *
+ * *********************************************************************** *
+ *                                                                         *
+ * copyright       : (C) 2024 by the members listed in the COPYING,        *
+ *                   LICENSE and WARRANTY file.                            *
+ * email           : info at matsim dot org                                *
+ *                                                                         *
+ * *********************************************************************** *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *   See also COPYING, LICENSE and WARRANTY file                           *
+ *                                                                         *
+ * *********************************************************************** */
+
 package org.matsim.prepare.transit;
 
 import org.apache.logging.log4j.LogManager;