diff --git a/src/main/java/org/matsim/run/RunLeipzigScenario.java b/src/main/java/org/matsim/run/RunLeipzigScenario.java index ec77748a..80d1500a 100644 --- a/src/main/java/org/matsim/run/RunLeipzigScenario.java +++ b/src/main/java/org/matsim/run/RunLeipzigScenario.java @@ -96,9 +96,13 @@ public class RunLeipzigScenario extends MATSimApplication { @CommandLine.Option(names = "--intermodality", defaultValue = "drtAndPtSeparateFromEachOther", description = "Define if drt should be used as access and egress mode for pt.") private DrtCaseSetup.PtDrtIntermodality ptDrtIntermodality; - public RunLeipzigScenario(@Nullable Config config) { super(config); } + public RunLeipzigScenario(@Nullable Config config) { + super(config); + } - public RunLeipzigScenario() { super(String.format("input/v%s/leipzig-v%s-10pct.config.xml", VERSION, VERSION)); } + public RunLeipzigScenario() { + super(String.format("input/v%s/leipzig-v%s-10pct.config.xml", VERSION, VERSION)); + } public static void main(String[] args) { MATSimApplication.run(RunLeipzigScenario.class, args); diff --git a/src/main/java/org/matsim/run/prepare/DrtCaseSetup.java b/src/main/java/org/matsim/run/prepare/DrtCaseSetup.java index 55770193..4769910d 100644 --- a/src/main/java/org/matsim/run/prepare/DrtCaseSetup.java +++ b/src/main/java/org/matsim/run/prepare/DrtCaseSetup.java @@ -71,7 +71,7 @@ public final class DrtCaseSetup { */ public enum PtDrtIntermodality {drtAndPtSeparateFromEachOther, drtAsAccessEgressForPt} - public DrtCaseSetup(){ } + private DrtCaseSetup(){} /** * prepare config for drt simulation. @@ -311,7 +311,8 @@ private static void preparePtDrtIntermodality(Controler controler, ShpOptions sh ConfigUtils.addOrGetModule(controler.getConfig(), MultiModeDrtConfigGroup.class).getModalElements().stream().findFirst().ifPresent(drtConfigGroup -> drtConfigGroup.getDrtFareParams().ifPresent(drtFareParams -> - prepareDrtFareCompensation(controler, drtModes, drtFareParams.baseFare))); //this only works if prepareConfig was called with the same ShpOptions + //this only works if prepareConfig was called with the same ShpOptions + prepareDrtFareCompensation(controler, drtModes, drtFareParams.baseFare))); } private static void prepareDrtFareCompensation(Controler controler, Set nonPtModes, Double ptBaseFare) { diff --git a/src/main/java/org/matsim/run/prepare/PrepareNetwork.java b/src/main/java/org/matsim/run/prepare/PrepareNetwork.java index 0fa372a5..f3a6ae2f 100644 --- a/src/main/java/org/matsim/run/prepare/PrepareNetwork.java +++ b/src/main/java/org/matsim/run/prepare/PrepareNetwork.java @@ -12,7 +12,6 @@ import org.matsim.application.options.ShpOptions; import org.matsim.core.network.NetworkUtils; import org.matsim.core.network.algorithms.MultimodalNetworkCleaner; -import org.matsim.core.network.algorithms.NetworkCleaner; import org.matsim.core.utils.geometry.geotools.MGC; import org.matsim.core.utils.gis.ShapeFileReader; import org.matsim.run.LeipzigUtils;