Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ public class EqasimConfigGroup extends ReflectiveConfigGroup {

private final static String ANALYSIS_INTERVAL = "analysisInterval";
private final static String ANALYSIS_DISTANCE_UNIT = "analysisDistanceUnit";

private final static String TRAVEL_TIME_RECORDING_INTERVAL = "travelTimeRecordingInterval";
private final static String TRAVEL_TIME_ANALYSIS_INTERVAL = "travelTimeAnalysisInterval";

private final static String USE_SCHEDULE_BASED_TRANSPORT = "useScheduleBasedTransport";

Expand All @@ -45,8 +46,9 @@ public class EqasimConfigGroup extends ReflectiveConfigGroup {

private int analysisInterval = 0;
private DistanceUnit analysisDistanceUnit = DistanceUnit.meter;

private int travelTimeRecordingInterval = 0;
private int travelTimeAnalysisInterval = 10;

private boolean useScheduleBasedTransport = true;

Expand All @@ -57,13 +59,13 @@ public class EqasimConfigGroup extends ReflectiveConfigGroup {
public EqasimConfigGroup() {
super(GROUP_NAME);
}

@Override
public final Map<String, String> getComments() {
Map<String, String> map = super.getComments();
map.put(SAMPLE_SIZE,
"The sample size of the population you are simulating. This is normally set by the synthesis pipeline.");

return map;
}

Expand Down Expand Up @@ -97,15 +99,25 @@ public void setUsePseudoRandomErrors(boolean usePseudoRandomErrors) {
this.usePseudoRandomErrors = usePseudoRandomErrors;
}

@StringGetter(TRAVEL_TIME_ANALYSIS_INTERVAL)
public int getTravelTimeAnalysisInterval() {
return travelTimeAnalysisInterval;
}

@StringSetter(TRAVEL_TIME_ANALYSIS_INTERVAL)
public void setTravelTimeAnalysisInterval(int TravelTimeAnalysisInterval) {
this.travelTimeAnalysisInterval = TravelTimeAnalysisInterval;
}

@Override
public ConfigGroup createParameterSet(String type) {
switch (type) {
case EstimatorParameterSet.GROUP_NAME:
return new EstimatorParameterSet();
case CostModelParameterSet.GROUP_NAME:
return new CostModelParameterSet();
default:
throw new IllegalArgumentException("Unknown parameter set type: " + type);
case EstimatorParameterSet.GROUP_NAME:
return new EstimatorParameterSet();
case CostModelParameterSet.GROUP_NAME:
return new CostModelParameterSet();
default:
throw new IllegalArgumentException("Unknown parameter set type: " + type);
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,31 @@
package org.eqasim.core.simulation.analysis;

import java.util.HashSet;

import org.eqasim.core.analysis.DefaultPersonAnalysisFilter;
import org.eqasim.core.analysis.PersonAnalysisFilter;
import org.eqasim.core.analysis.activities.ActivityListener;
import org.eqasim.core.analysis.legs.LegListener;
import org.eqasim.core.analysis.pt.PublicTransportLegListener;
import org.eqasim.core.analysis.trips.TripListener;
import org.eqasim.core.components.config.EqasimConfigGroup;
import org.eqasim.core.components.travel_time.TravelTimeRecorder;
import org.eqasim.core.scenario.cutter.network.RoadNetwork;
import org.eqasim.core.simulation.analysis.stuck.StuckAnalysisModule;
import org.eqasim.core.simulation.analysis.travel_time.TravelTimeComparisonListener;
import org.eqasim.core.simulation.modes.drt.analysis.DrtAnalysisModule;
import org.matsim.api.core.v01.network.Network;
import org.matsim.api.core.v01.population.Population;
import org.matsim.contrib.drt.run.MultiModeDrtConfigGroup;
import org.matsim.core.api.experimental.events.EventsManager;
import org.matsim.core.config.Config;
import org.matsim.core.config.groups.ControllerConfigGroup;
import org.matsim.core.config.groups.RoutingConfigGroup;
import org.matsim.core.controler.AbstractModule;
import org.matsim.core.controler.OutputDirectoryHierarchy;
import org.matsim.core.router.AnalysisMainModeIdentifier;
import org.matsim.core.router.RoutingModeMainModeIdentifier;
import org.matsim.core.utils.timing.TimeInterpretation;
import org.matsim.pt.transitSchedule.api.TransitSchedule;

import com.google.inject.Provides;
Expand All @@ -37,8 +47,9 @@ public void install() {
}

install(new StuckAnalysisModule());

bind(AnalysisMainModeIdentifier.class).toInstance(new RoutingModeMainModeIdentifier());
addControlerListenerBinding().to(TravelTimeComparisonListener.class);
}

@Provides
Expand All @@ -59,7 +70,7 @@ public PublicTransportLegListener providePublicTransportListener(Network network
PersonAnalysisFilter personFilter) {
return new PublicTransportLegListener(schedule);
}

@Provides
@Singleton
public ActivityListener provideActivityListener(PersonAnalysisFilter personFilter) {
Expand All @@ -77,4 +88,15 @@ public TravelTimeRecorder travelTimeRecorder(Network network, Config config) {
}
return new TravelTimeRecorder(new RoadNetwork(network), startTime, stopTime, 600);
}

@Provides
@Singleton
public TravelTimeComparisonListener provideTravelTimeComparisionListener(Population population,
TimeInterpretation timeInterpretation,
OutputDirectoryHierarchy outputDirectoryHierarchy, EventsManager eventsManager,
EqasimConfigGroup eqasimConfig, RoutingConfigGroup routingConfig, ControllerConfigGroup controllerConfig) {
return new TravelTimeComparisonListener(population, timeInterpretation, outputDirectoryHierarchy,
eventsManager, eqasimConfig.getTravelTimeAnalysisInterval(), eqasimConfig.getAnalysisInterval(),
new HashSet<>(routingConfig.getNetworkModes()));
}
}
Loading