Skip to content

Commit

Permalink
try satisfy checkstyle
Browse files Browse the repository at this point in the history
  • Loading branch information
tschlenther committed Feb 15, 2024
1 parent 21e7508 commit 826dd31
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
8 changes: 6 additions & 2 deletions src/main/java/org/matsim/run/RunLeipzigScenario.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/matsim/run/prepare/DrtCaseSetup.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public final class DrtCaseSetup {
*/
public enum PtDrtIntermodality {drtAndPtSeparateFromEachOther, drtAsAccessEgressForPt}

public DrtCaseSetup(){ }
private DrtCaseSetup(){}

/**
* prepare config for drt simulation.
Expand Down Expand Up @@ -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<String> nonPtModes, Double ptBaseFare) {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/matsim/run/prepare/PrepareNetwork.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 826dd31

Please sign in to comment.