diff --git a/pom.xml b/pom.xml index 9cfc950..edd10d6 100644 --- a/pom.xml +++ b/pom.xml @@ -52,6 +52,19 @@ + + org.apache.maven.plugins + maven-failsafe-plugin + 3.5.2 + + + + integration-test + verify + + + + diff --git a/src/main/java/ch/sbb/pfi/netzgrafikeditor/converter/adapter/matsim/MatsimSupplyFactory.java b/src/main/java/ch/sbb/pfi/netzgrafikeditor/converter/adapter/matsim/MatsimSupplyFactory.java index 98bbace..6c97558 100644 --- a/src/main/java/ch/sbb/pfi/netzgrafikeditor/converter/adapter/matsim/MatsimSupplyFactory.java +++ b/src/main/java/ch/sbb/pfi/netzgrafikeditor/converter/adapter/matsim/MatsimSupplyFactory.java @@ -72,7 +72,7 @@ TransitRoute createTransitRoute(TransitLine transitLine, String id, List(List.of(Default.LINK_MODE))); + link.setAllowedModes(new HashSet<>(List.of(Default.NETWORK_MODE))); link.setLength(length); link.setFreespeed(Default.LINK_FREESPEED); link.setCapacity(Default.LINK_CAPACITY); @@ -175,6 +175,7 @@ VehicleType getOrCreateVehicleType(String id, double length, double maxVelocity, vehicleType.getCapacity().setStandingRoom(standingRoom); vehicleType.setMaximumVelocity(maxVelocity); vehicleType.setLength(length); + vehicleType.setNetworkMode(Default.NETWORK_MODE); VehicleUtils.setDoorOperationMode(vehicleType, VehicleType.DoorOperationMode.parallel); VehicleUtils.setAccessTime(vehicleType, Default.VEHICLE_ACCESS_TIME); VehicleUtils.setEgressTime(vehicleType, Default.VEHICLE_EGRESS_TIME); @@ -201,10 +202,10 @@ Vehicle getOrCreateVehicle(VehicleType vehicleType, String id) { } private static class Default { + private static final String NETWORK_MODE = "pt"; private static final double LINK_FREESPEED = 10000.; private static final double LINK_CAPACITY = 10000.; private static final double LINK_LANES = 1.; - private static final String LINK_MODE = "rail"; private static final double VEHICLE_ACCESS_TIME = 1.; private static final double VEHICLE_EGRESS_TIME = 1.; } diff --git a/src/main/java/ch/sbb/pfi/netzgrafikeditor/converter/io/matsim/TransitScheduleXmlWriter.java b/src/main/java/ch/sbb/pfi/netzgrafikeditor/converter/io/matsim/TransitScheduleXmlWriter.java index 1f9b07d..908c36b 100644 --- a/src/main/java/ch/sbb/pfi/netzgrafikeditor/converter/io/matsim/TransitScheduleXmlWriter.java +++ b/src/main/java/ch/sbb/pfi/netzgrafikeditor/converter/io/matsim/TransitScheduleXmlWriter.java @@ -16,7 +16,7 @@ public class TransitScheduleXmlWriter implements ConverterSink { private static final String CONFIG_FILE = "config.xml"; - private static final String NETWORK_FILE = "network.xml.gz"; + private static final String NETWORK_FILE = "transitNetwork.xml.gz"; private static final String TRANSIT_SCHEDULE_FILE = "transitSchedule.xml.gz"; private static final String TRANSIT_VEHICLE_FILE = "transitVehicles.xml.gz";