Skip to content

Commit

Permalink
clean code
Browse files Browse the repository at this point in the history
  • Loading branch information
@tschlenther
tschlenther committed Feb 7, 2024
1 parent 1270018 commit d12b0ad
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 148 deletions.
7 changes: 2 additions & 5 deletions src/main/java/org/matsim/run/RunLeipzigScenario.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,6 @@ public class RunLeipzigScenario extends MATSimApplication {
@CommandLine.Option(names = "--parking-cost-time-period-end", defaultValue = "0", description = "End of time period for which parking cost will be charged.")
private Double parkingCostTimePeriodEnd;

@CommandLine.Option(names = "--drt-case", defaultValue = "oneServiceArea", description = "Defines how drt is modelled. For a more detailed description see class DrtCaseSetup.")
private DrtCaseSetup.DrtCase drtCase;

@CommandLine.Option(names = "--intermodality", defaultValue = "drtAndPtSeparateFromEachOther", description = "Define if drt should be used as access and egress mode for pt.")
private DrtCaseSetup.PtDrtIntermodality ptDrtIntermodality;

Expand Down Expand Up @@ -276,7 +273,7 @@ protected void prepareScenario(Scenario scenario) {
// (passt das Netz an aus den mitgegebenen shape files, z.B. parking area, car-free area, ...)

if (networkOpt.hasDrtArea()) {
DrtCaseSetup.prepareScenario(scenario, /*drtCase, */ new ShpOptions(networkOpt.getDrtArea(), null, null), VERSION);
DrtCaseSetup.prepareScenario(scenario, new ShpOptions(networkOpt.getDrtArea(), null, null), VERSION);
}

}
Expand Down Expand Up @@ -324,7 +321,7 @@ public void install() {
});

if (networkOpt.hasDrtArea()) {
DrtCaseSetup.prepareControler(controler,/* drtCase,*/ new ShpOptions(networkOpt.getDrtArea(), null, null), ptDrtIntermodality);
DrtCaseSetup.prepareControler(controler, new ShpOptions(networkOpt.getDrtArea(), null, null), ptDrtIntermodality);
}

if (bike == BicycleHandling.onNetworkWithBicycleContrib) {
Expand Down
146 changes: 3 additions & 143 deletions src/main/java/org/matsim/run/prepare/DrtCaseSetup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,6 @@ public final class DrtCaseSetup {
//this is not nice because the static set is only filled in prepareConfig
static Set<String> drtModes = new HashSet<>();

/**
* Defines if drt is modelled at all (none), with 2 separate modes (twoSeparateServiceAreas) or with 1 single drt mode (oneServiceArea).
* As this class is only triggered if a shp of the drt service area was provided, none is inactive for now
* <br> <b>tschlenther, feb' 02, 2024:</b> all the necessary information (nrOfServices, nrOfVehicles, modes etc.) shall be provided by the shape file, so this enum is strictly not needed.
*/
public enum DrtCase {/*none,*/ twoSeparateServiceAreas /*, oneServiceArea*/}

/**
* Defines if intermodality between drt and pt is modelled or not.
*/
Expand All @@ -83,7 +76,7 @@ public DrtCaseSetup(){ }
/**
* prepare config for drt simulation.
*/
public static void prepareConfig(Config config,/* DrtCase drtCase,*/ ShpOptions drtAreas) throws URISyntaxException {
public static void prepareConfig(Config config, ShpOptions drtAreas) throws URISyntaxException {

MultiModeDrtConfigGroup multiModeDrtConfigGroup = ConfigUtils.addOrGetModule(config, MultiModeDrtConfigGroup.class);
DvrpConfigGroup dvrpConfigGroup = ConfigUtils.addOrGetModule(config, DvrpConfigGroup.class);
Expand Down Expand Up @@ -118,14 +111,11 @@ public static void prepareConfig(Config config,/* DrtCase drtCase,*/ ShpOptions
for (String mode : drtModes){
createDrtModeConfigGroup(multiModeDrtConfigGroup, mode);
}
// createDrtModeConfigGroup(multiModeDrtConfigGroup, TransportMode.drt + "North", drtArea.getShapeFile().toString());
// createDrtModeConfigGroup(multiModeDrtConfigGroup, TransportMode.drt + "Southeast", drtArea.getShapeFile().toString());
}

multiModeDrtConfigGroup.getModalElements().forEach(drtConfigGroup -> {
drtConfigGroup.addParameterSet(drtFareParams);
DrtConfigs.adjustDrtConfig(drtConfigGroup, config.planCalcScore(), config.plansCalcRoute());
// drtModes.add(drtConfigGroup.getMode());

configureNecessaryConfigGroups(config, drtConfigGroup.getMode());
DrtSpeedUpParams drtSpeedUpParams = new DrtSpeedUpParams();
Expand All @@ -141,66 +131,6 @@ public static void prepareConfig(Config config,/* DrtCase drtCase,*/ ShpOptions
drtConfigGroup.addParameterSet(drtSpeedUpParams);
});

// switch (drtCase) {
// case twoSeparateServiceAreas -> {
// if (multiModeDrtConfigGroup.getModalElements().isEmpty()) {
// createDrtModeConfigGroup(multiModeDrtConfigGroup, TransportMode.drt + "North", drtArea.getShapeFile().toString());
// createDrtModeConfigGroup(multiModeDrtConfigGroup, TransportMode.drt + "Southeast", drtArea.getShapeFile().toString());
// }
// //flexa case with 2 separate drt bubbles (north and southeast) -> 2 separate drt modes
//
// multiModeDrtConfigGroup.getModalElements().forEach(drtConfigGroup -> {
// drtConfigGroup.addParameterSet(drtFareParams);
// DrtConfigs.adjustDrtConfig(drtConfigGroup, config.planCalcScore(), config.plansCalcRoute());
// drtModes.add(drtConfigGroup.getMode());
//
//
// configureNecessaryConfigGroups(config, drtConfigGroup.getMode());
// DrtSpeedUpParams drtSpeedUpParams = new DrtSpeedUpParams();
// drtSpeedUpParams.fractionOfIterationsSwitchOn = 0.0;
// drtSpeedUpParams.fractionOfIterationsSwitchOff = 1.0;
// drtSpeedUpParams.firstSimulatedDrtIterationToReplaceInitialDrtPerformanceParams = 10000;
// // update to real world data
// drtSpeedUpParams.initialWaitingTime = 345.6;
// // update to real world data
// drtSpeedUpParams.initialInVehicleBeelineSpeed = 20/3.6;
// drtSpeedUpParams.intervalDetailedIteration = 10000;
// drtSpeedUpParams.waitingTimeUpdateDuringSpeedUp = DrtSpeedUpParams.WaitingTimeUpdateDuringSpeedUp.Disabled;
// drtConfigGroup.addParameterSet(drtSpeedUpParams);
// });
//
//
// }
//
// case oneServiceArea -> {
// //"normal" drt, modelled as one single drt mode
// if (multiModeDrtConfigGroup.getModalElements().isEmpty()) {
// createDrtModeConfigGroup(multiModeDrtConfigGroup, TransportMode.drt, drtArea.getShapeFile().toString());
// }
//
// multiModeDrtConfigGroup.getModalElements().forEach(drtConfigGroup -> {
// drtConfigGroup.addParameterSet(drtFareParams);
// DrtConfigs.adjustDrtConfig(drtConfigGroup, config.planCalcScore(), config.plansCalcRoute());
// drtModes.add(drtConfigGroup.getMode());
//
// configureNecessaryConfigGroups(config, drtConfigGroup.getMode());
// DrtSpeedUpParams drtSpeedUpParams = new DrtSpeedUpParams();
// drtSpeedUpParams.fractionOfIterationsSwitchOn = 0.0;
// drtSpeedUpParams.fractionOfIterationsSwitchOff = 1.0;
// drtSpeedUpParams.firstSimulatedDrtIterationToReplaceInitialDrtPerformanceParams = 10000;
// // update to real world data
// drtSpeedUpParams.initialWaitingTime = 345.6;
// // update to real world data
// drtSpeedUpParams.initialInVehicleBeelineSpeed = 20/3.6;
// drtSpeedUpParams.intervalDetailedIteration = 10000;
// drtSpeedUpParams.waitingTimeUpdateDuringSpeedUp = DrtSpeedUpParams.WaitingTimeUpdateDuringSpeedUp.Disabled;
// drtConfigGroup.addParameterSet(drtSpeedUpParams);
//
// });
// }
// default -> throw new IllegalStateException(errorMessage + (drtCase));
// }

//drt modes have to be set as network modes in dvrp CfgGroup
dvrpConfigGroup.networkModes = drtModes;
//after adding mode specific multiModeDrtParams -> adjust
Expand All @@ -210,25 +140,16 @@ public static void prepareConfig(Config config,/* DrtCase drtCase,*/ ShpOptions
* prepare scenario for drt simulation. more specifically, create input vehicles and stops files.
* this method does not (!?) change the network. For this, please refer to NetworkOptions.prepareDRT
*/
public static void prepareScenario(Scenario scenario,/* DrtCase drtCase, */ ShpOptions drtAreas, String version) {
public static void prepareScenario(Scenario scenario, ShpOptions drtAreas, String version) {

scenario.getPopulation().getFactory().getRouteFactories().setRouteFactory(DrtRoute.class, new DrtRouteFactory());
// (matsim core does not know about DRT routes. This makes it possible to read them before the controler is there.)



CreateDrtStopsFromNetwork drtStopsCreator = new CreateDrtStopsFromNetwork();
MultiModeDrtConfigGroup multiModeDrtConfigGroup = ConfigUtils.addOrGetModule(scenario.getConfig(), MultiModeDrtConfigGroup.class);

// String drtMode;
// switch (drtCase) {
// case twoSeparateServiceAreas -> {
//flexa case with 2 separate drt bubbles (north and southeast) -> 2 separate drt modes

log.info("reading " + drtAreas.getShapeFile().toString());
for (SimpleFeature feature : drtAreas.readFeatures()) {
// for (String drtMode : this.drtModes2Feature.keySet()) {
// String name = (String) feature.getAttribute("Name");
String drtMode = String.valueOf(feature.getAttribute("mode"));
if (drtMode.equals("null")) {
throw new IllegalArgumentException("could not find 'mode' attribute in the given shape file at " + drtAreas.getShapeFile().toString());
Expand All @@ -251,14 +172,12 @@ public static void prepareScenario(Scenario scenario,/* DrtCase drtCase, */ ShpO
//normally the following code would be set in prepareConfig, but..
//.. the stops creator relies on a network with drt modes. Drt modes are added in RunLeipzigScenario.prepareScenario()..
//.. so stops are created after that step -sme0823
// multiModeDrtConfigGroup.getModalElements().forEach(drtConfigGroup -> {
DrtConfigGroup drtConfigGroup = multiModeDrtConfigGroup.getModalElements().stream().
filter(cfg -> cfg.getMode().equals(drtMode))
.findFirst().orElseThrow();
{
//path, tho which stops.xml is saved
URL path = IOUtils.extendUrl(scenario.getConfig().getContext(), "leipzig-v" + version + "-" + drtMode + "-stops.xml");
// URL path = IOUtils.extendUrl(scenario.getConfig().getContext(), "leipzig-v" + version + "-" + drtConfigGroup.getMode() + "-area.shp");
File file = null;
try {
file = new File(path.toURI());
Expand All @@ -276,58 +195,14 @@ public static void prepareScenario(Scenario scenario,/* DrtCase drtCase, */ ShpO
//naming pattern comes from @DrtStopsWriter line 81. Should be ok to hard code it here. -sme0523
drtConfigGroup.transitStopFile = file.toString();

// new ShapeFileWriter().writeGeometries(List.of(feature), file.toString());
// drtConfigGroup.drtServiceAreaShapeFile = file.toString();
// drtConfigGroup.operationalScheme = DrtConfigGroup.OperationalScheme.serviceAreaBased; //TODO move this to prepareConfig

// configureNecessaryConfigGroups(scenario.getConfig(), drtConfigGroup.getMode());
}
// });
}
// }

// case oneServiceArea -> {
// //"normal" drt, modelled as one single drt mode
// drtMode = TransportMode.drt;
//
// //make the 400 configurable??? -sme0723
// new LeipzigDrtVehicleCreator().createDrtVehicles(scenario.getVehicles(), scenario.getNetwork(),
// drtArea, 400, drtMode);
//
// //normally the following code would be set in prepareConfig, but..
// //.. the stops creator relies on a network with drt modes. Drt modes are added in RunLeipzigScenario.prepareScenario()..
// //.. so stops are created after that step -sme0823
// multiModeDrtConfigGroup.getModalElements().forEach(drtConfigGroup -> {
//
// //path, tho which stops.xml is saved
// URL path = IOUtils.extendUrl(scenario.getConfig().getContext(), "leipzig-v" + version + "-" + drtConfigGroup.getMode() + "-stops.xml");
// File stopsFile = null;
// try {
// stopsFile = new File(path.toURI());
// } catch (URISyntaxException e) {
// log.fatal(e);
// }
//
// //create drt stops and save them next to config -> put it as input stops file.
// //unfortunately there is no scenario.setDrtStops, so we have to do this workaround. -sme0723
// drtStopsCreator.processNetworkForStopCreation(scenario.getNetwork(), true, drtArea.getGeometry(),
// drtArea.getShapeFile().toString() + "_" + drtConfigGroup.getMode() + "_stops.csv", drtConfigGroup.getMode(),
// stopsFile.toString(), drtArea);
//
// //naming pattern comes from @DrtStopsWriter line 81. Should be ok to hard code it here. -sme0523
// drtConfigGroup.transitStopFile = stopsFile.toString();
//
// });
//
// }
// default -> throw new IllegalStateException(errorMessage + (drtCase));
// }
}

/**
* prepare controler for drt simulation.
*/
public static void prepareControler(Controler controler,/* DrtCase drtCase,*/ ShpOptions drtAreas, PtDrtIntermodality ptDrtIntermodality) {
public static void prepareControler(Controler controler, ShpOptions drtAreas, PtDrtIntermodality ptDrtIntermodality) {

MultiModeDrtConfigGroup multiModeDrtConfigGroup = ConfigUtils.addOrGetModule(controler.getConfig(), MultiModeDrtConfigGroup.class);
controler.addOverridingModule(new DvrpModule());
Expand All @@ -350,25 +225,10 @@ public void install() {
}
}

// switch (drtCase) {
// case twoSeparateServiceAreas -> {
//flexa case with 2 separate drt bubbles (north and southeast) -> 2 separate drt modes

//if intermodality between pt and drt -> only railways are tagged as intermodal stations (this is how it is handled in reality) -sme0723
if (ptDrtIntermodality.equals(PtDrtIntermodality.drtAsAccessEgressForPt)) {
preparePtDrtIntermodality(controler, drtAreas, true);
}
// }
//
// case oneServiceArea -> {
// //"normal" drt, modelled as one single drt mode
//
// if (ptDrtIntermodality.equals(PtDrtIntermodality.drtAsAccessEgressForPt)) {
// preparePtDrtIntermodality(controler, drtArea, false);
// }
// }
// default -> throw new IllegalStateException(errorMessage + (drtCase));
// }
}

/**
Expand Down

0 comments on commit d12b0ad

Please sign in to comment.