Merge pull request #135 from matsim-scenarios/endlessCircleLine

Endless circle line

Makefile

@@ -131,6 +131,13 @@ $p/berlin-$V-network-with-pt.xml.gz: $p/berlin-$V-network.xml.gz
 	 --merge-stops mergeToParentAndRouteTypes\
 	 --shp $p/pt-area/pt-area.shp
 
+	$(sc) prepare endless-circle-line\
+ 	  --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.xml.gz\
+	  --output-transit-vehicles $p/berlin-$V-transitVehicles.xml.gz
+
 $p/berlin-$V-counts-vmz.xml.gz: $p/berlin-$V-network.xml.gz
 	$(sc) prepare counts-from-vmz\
 	 --excel ../shared-svn/projects/matsim-berlin/berlin-v5.5/original_data/vmz_counts_2018/Datenexport_2018_TU_Berlin.xlsx\

pom.xml

@@ -77,6 +77,10 @@
 					<groupId>xerces</groupId>
 					<artifactId>xercesImpl</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>com.github.matsim-org</groupId>
+					<artifactId>gtfs2matsim</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
@@ -128,7 +132,7 @@
 		<dependency>
 			<groupId>com.github.matsim-org</groupId>
 			<artifactId>gtfs2matsim</artifactId>
-			<version>19f1676fc6</version>
+			<version>45689bf834</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.matsim</groupId>

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 {