diff --git a/src/main/java/org/matsim/legacy/prepare/drt/DrtVehicleCreator.java b/src/main/java/org/matsim/legacy/prepare/drt/DrtVehicleCreator.java index 698a5f6e..1fb65a1e 100644 --- a/src/main/java/org/matsim/legacy/prepare/drt/DrtVehicleCreator.java +++ b/src/main/java/org/matsim/legacy/prepare/drt/DrtVehicleCreator.java @@ -81,21 +81,21 @@ public class DrtVehicleCreator { public static void main(String[] args) { String networkFile = "https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/berlin-v6.1/input/berlin-v6.1-network-with-pt.xml.gz"; -// String populationFile = "https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/berlin-v5.5-10pct/input/berlin-v5.5-10pct.plans.xml.gz"; +// String populationFile = ""; // String facilitiesFile = ""; String drtServiceAreaShapeFile = "https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/berlin-v6.1/input/shp/Berlin_25832.shp"; String scenarioCrs = "EPSG:25832"; String shapeCrs = "EPSG:25832"; -// String vehiclesFilePrefix = "berlin-drt-v5.5.spandau_b-drt-by-actLocations-sqrt-"; - String vehiclesFilePrefix = "berlin-drt-v5.5.drt-by-rndLocations-"; +// String vehiclesFilePrefix = "berlin-v6.1.spandau_b-drt-by-actLocations-sqrt-"; + String vehiclesFilePrefix = "berlin-v6.1.drt-by-rndLocations-"; Set numbersOfVehicles = new HashSet<>(); // numbersOfVehicles.add(20); // numbersOfVehicles.add(30); // numbersOfVehicles.add(50); // numbersOfVehicles.add(80); -// numbersOfVehicles.add(100); + numbersOfVehicles.add(100); // numbersOfVehicles.add(120); // numbersOfVehicles.add(150); // numbersOfVehicles.add(200); @@ -115,7 +115,7 @@ public static void main(String[] args) { // numbersOfVehicles.add(3000); // numbersOfVehicles.add(4000); // numbersOfVehicles.add(5000); - numbersOfVehicles.add(10000); +// numbersOfVehicles.add(10000); int seats = 4; DrtVehicleCreator tvc = new DrtVehicleCreator(networkFile, drtServiceAreaShapeFile, shapeCrs, scenarioCrs); diff --git a/src/main/java/org/matsim/legacy/run/drt/OpenBerlinIntermodalPtDrtRouterModeIdentifier.java b/src/main/java/org/matsim/legacy/run/drt/OpenBerlinIntermodalPtDrtRouterModeIdentifier.java index 504e0d3b..0f9fe842 100644 --- a/src/main/java/org/matsim/legacy/run/drt/OpenBerlinIntermodalPtDrtRouterModeIdentifier.java +++ b/src/main/java/org/matsim/legacy/run/drt/OpenBerlinIntermodalPtDrtRouterModeIdentifier.java @@ -48,7 +48,7 @@ public OpenBerlinIntermodalPtDrtRouterModeIdentifier() { drtModes = Arrays.asList(TransportMode.drt, "drt2", "drt_teleportation"); modeHierarchy.add( TransportMode.walk ) ; - modeHierarchy.add( "bicycle" ); // TransportMode.bike is not registered as main mode, only "bicycle" ; + modeHierarchy.add( TransportMode.bike ); modeHierarchy.add( TransportMode.ride ) ; modeHierarchy.add( TransportMode.car ) ; modeHierarchy.add( "car2" ) ;