Skip to content

Commit

Permalink
DrtModeAvailabilityWrapper and FeederDrtModeAvailabilityWrapper are n…
Browse files Browse the repository at this point in the history 
…ow compatible with non-drt simulations (#209)

* feat: DrtModeAvailabilityWrapper now supports null values

* feat: FeederDrtModeAvailabilityWrapper now supports null values for MultiModeDrtConfigGroup and MultiModeFeederDrtConfigGroup

* chore: using FeederDrtModeAvailabilityWrapper instead of explicitly passing extra modes to runMelunSimulation
  • Loading branch information
@tkchouaki
tkchouaki authored Mar 28, 2024
1 parent 4b93368 commit 708cb61
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 24 deletions.
12 changes: 11 additions & 1 deletion ...ain/java/org/eqasim/core/simulation/modes/drt/mode_choice/DrtModeAvailabilityWrapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,26 @@
import org.matsim.contrib.drt.run.MultiModeDrtConfigGroup;
import org.matsim.contribs.discrete_mode_choice.model.DiscreteModeChoiceTrip;
import org.matsim.contribs.discrete_mode_choice.model.mode_availability.ModeAvailability;
import org.matsim.core.config.Config;

import java.util.Collection;
import java.util.Collections;
import java.util.List;

public class DrtModeAvailabilityWrapper implements ModeAvailability {
private final Collection<String> drtModes;
private final ModeAvailability delegate;

public DrtModeAvailabilityWrapper(Config config, ModeAvailability delegate) {
this((MultiModeDrtConfigGroup) config.getModules().get(MultiModeDrtConfigGroup.GROUP_NAME), delegate);
}

public DrtModeAvailabilityWrapper(MultiModeDrtConfigGroup multiModeDrtConfigGroup, ModeAvailability delegate) {
this.drtModes = multiModeDrtConfigGroup.modes().toList();
if(multiModeDrtConfigGroup != null) {
this.drtModes = multiModeDrtConfigGroup.modes().toList();
} else {
this.drtModes = Collections.emptyList();
}
this.delegate = delegate;
}

Expand Down
30 changes: 24 additions & 6 deletions ...eqasim/core/simulation/modes/feeder_drt/mode_choice/FeederDrtModeAvailabilityWrapper.java
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,43 @@
package org.eqasim.core.simulation.modes.feeder_drt.mode_choice;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.eqasim.core.simulation.modes.feeder_drt.config.MultiModeFeederDrtConfigGroup;
import org.matsim.api.core.v01.population.Person;
import org.matsim.contrib.drt.run.MultiModeDrtConfigGroup;
import org.matsim.contribs.discrete_mode_choice.model.DiscreteModeChoiceTrip;
import org.matsim.contribs.discrete_mode_choice.model.mode_availability.ModeAvailability;
import org.matsim.core.config.Config;

import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;

public class FeederDrtModeAvailabilityWrapper implements ModeAvailability {
private final static Logger logger = LogManager.getLogger(FeederDrtModeAvailabilityWrapper.class);
private final Set<String> extraModes;
private final ModeAvailability delegate;

public FeederDrtModeAvailabilityWrapper(Config config, ModeAvailability delegate) {
this((MultiModeDrtConfigGroup) config.getModules().get(MultiModeDrtConfigGroup.GROUP_NAME), (MultiModeFeederDrtConfigGroup) config.getModules().get(MultiModeFeederDrtConfigGroup.GROUP_NAME), delegate);
}

public FeederDrtModeAvailabilityWrapper(MultiModeDrtConfigGroup multiModeDrtConfigGroup, MultiModeFeederDrtConfigGroup multiModeFeederDrtConfigGroup, ModeAvailability delegate) {
this.delegate = delegate;
this.extraModes = multiModeFeederDrtConfigGroup.modes().collect(Collectors.toSet());
Collection<String> coveredDrtModes = multiModeFeederDrtConfigGroup.getModalElements().stream().map(cfg -> cfg.accessEgressModeName).toList();
this.extraModes.addAll(multiModeDrtConfigGroup.modes().filter(mode -> !coveredDrtModes.contains(mode)).toList());
Collection<String> coveredDrtModes;
if(multiModeFeederDrtConfigGroup == null) {
this.extraModes = new HashSet<>();
coveredDrtModes = Collections.emptyList();
} else {
this.extraModes = multiModeFeederDrtConfigGroup.modes().collect(Collectors.toSet());
coveredDrtModes = multiModeFeederDrtConfigGroup.getModalElements().stream().map(cfg -> cfg.accessEgressModeName).toList();
}
if(multiModeDrtConfigGroup == null) {
if(multiModeFeederDrtConfigGroup != null) {
logger.warn(String.format("A %s config was supplied but a %s was not, DRT modes not covered by a feeder mode will not be considered", MultiModeFeederDrtConfigGroup.GROUP_NAME, MultiModeDrtConfigGroup.GROUP_NAME));
}
} else {
this.extraModes.addAll(multiModeDrtConfigGroup.modes().filter(mode -> !coveredDrtModes.contains(mode)).toList());
}
}

@Override
Expand Down
44 changes: 27 additions & 17 deletions core/src/test/java/org/eqasim/TestSimulationPipeline.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package org.eqasim;

import com.google.inject.Inject;
import com.google.inject.Provider;
import org.apache.commons.io.FileUtils;
import org.eqasim.core.analysis.run.RunLegAnalysis;
import org.eqasim.core.analysis.run.RunPublicTransportLegAnalysis;
Expand All @@ -13,6 +15,7 @@
import org.eqasim.core.simulation.modes.drt.analysis.run.RunDrtPassengerAnalysis;
import org.eqasim.core.simulation.modes.drt.analysis.run.RunDrtVehicleAnalysis;
import org.eqasim.core.simulation.modes.feeder_drt.analysis.run.RunFeederDrtPassengerAnalysis;
import org.eqasim.core.simulation.modes.feeder_drt.mode_choice.FeederDrtModeAvailabilityWrapper;
import org.eqasim.core.simulation.modes.feeder_drt.utils.AdaptConfigForFeederDrt;
import org.eqasim.core.tools.*;
import org.eqasim.core.simulation.modes.drt.utils.AdaptConfigForDrt;
Expand All @@ -22,6 +25,7 @@
import org.junit.Test;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.TransportMode;
import org.matsim.contribs.discrete_mode_choice.model.mode_availability.ModeAvailability;
import org.matsim.core.config.CommandLine;
import org.matsim.core.config.Config;
import org.matsim.core.config.ConfigUtils;
Expand Down Expand Up @@ -49,7 +53,7 @@ public void tearDown() throws IOException {
FileUtils.deleteDirectory(new File("melun_test"));
}

private void runMelunSimulation(String configPath, String outputPath, Collection<String> extraModes) {
private void runMelunSimulation(String configPath, String outputPath) {
EqasimConfigurator eqasimConfigurator = new EqasimConfigurator();
Config config = ConfigUtils.loadConfig(configPath, eqasimConfigurator.getConfigGroups());
((ControlerConfigGroup) config.getModules().get(ControlerConfigGroup.GROUP_NAME)).setOutputDirectory(outputPath);
Expand All @@ -69,19 +73,25 @@ private void runMelunSimulation(String configPath, String outputPath, Collection
@Override
protected void installEqasimExtension() {
bind(ModeParameters.class);
bindModeAvailability("DefaultModeAvailability").toProvider(() -> (person, trips) -> {
Set<String> modes = new HashSet<>();
modes.add(TransportMode.walk);
modes.add(TransportMode.pt);
modes.add(TransportMode.car);
modes.add(TransportMode.bike);
// Add special mode "car_passenger" if applicable
Boolean isCarPassenger = (Boolean) person.getAttributes().getAttribute("isPassenger");
if(isCarPassenger) {
modes.add("car_passenger");
bindModeAvailability("DefaultModeAvailability").toProvider(new Provider<>() {
@Inject
private Config config;
@Override
public ModeAvailability get() {
return new FeederDrtModeAvailabilityWrapper(config, (person, trips) -> {
Set<String> modes = new HashSet<>();
modes.add(TransportMode.walk);
modes.add(TransportMode.pt);
modes.add(TransportMode.car);
modes.add(TransportMode.bike);
// Add special mode "car_passenger" if applicable
Boolean isCarPassenger = (Boolean) person.getAttributes().getAttribute("isPassenger");
if(isCarPassenger) {
modes.add("car_passenger");
}
return modes;
});
}
modes.addAll(extraModes);
return modes;
}).asEagerSingleton();
}
});
Expand Down Expand Up @@ -194,7 +204,7 @@ public void testDrt() throws IOException, CommandLine.ConfigurationException {
"--vehicles-paths", "melun_test/input/drt_vehicles_a.xml.gz,melun_test/input/drt_vehicles_b.xml.gz"
});

runMelunSimulation("melun_test/input/config_drt.xml", "melun_test/output_drt", List.of("drt_a", "drt_b"));
runMelunSimulation("melun_test/input/config_drt.xml", "melun_test/output_drt");

RunDrtPassengerAnalysis.main(new String[] {
"--events-path", "melun_test/output_drt/output_events.xml.gz",
Expand Down Expand Up @@ -243,7 +253,7 @@ public void testFeeder() throws IOException, CommandLine.ConfigurationException
"--access-egress-transit-stop-modes", "rail|tram|subway"
});

runMelunSimulation("melun_test/input/config_feeder.xml", "melun_test/output_feeder", List.of("feeder_a", "feeder_b"));
runMelunSimulation("melun_test/input/config_feeder.xml", "melun_test/output_feeder");

RunFeederDrtPassengerAnalysis.main(new String[] {
"--config-path", "melun_test/input/config_feeder.xml",
Expand All @@ -260,12 +270,12 @@ public void testEpsilon() throws CommandLine.ConfigurationException {
"--output-config-path", "melun_test/input/config_epsilon.xml"
});

runMelunSimulation("melun_test/input/config_epsilon.xml", "melun_test/output_epsilon", Collections.emptyList());
runMelunSimulation("melun_test/input/config_epsilon.xml", "melun_test/output_epsilon");
}

@Test
public void testPipeline() throws Exception {
runMelunSimulation("melun_test/input/config.xml", "melun_test/output", Collections.emptyList());
runMelunSimulation("melun_test/input/config.xml", "melun_test/output");
runAnalyses();
runExports();
}
Expand Down

0 comments on commit 708cb61

Please sign in to comment.