feat: model update 2024 #266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

sebhoerl wants to merge 100 commits into develop from feat/model-2024

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,3 +7,4 @@ dependency-reduced-pom.xml @@
     *.iml
     *.idea
     simulation_output
+    .vscode

core/src/main/java/org/eqasim/core/components/raptor/EqasimRaptorConfigGroup.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -10,26 +10,26 @@ public EqasimRaptorConfigGroup() {
  
    	}

    	@Parameter

    	public double travelTimeRail_u_h = -7.0;

    	public double travelTimeRail_u_h = -0.08317394412379128;

    	@Parameter

    	public double travelTimeSubway_u_h = -7.0;

    	public double travelTimeSubway_u_h = -1.0;

    	@Parameter

    	public double travelTimeBus_u_h = -7.0;

    	public double travelTimeBus_u_h = -2.8470557962683523;

    	@Parameter

    	public double travelTimeTram_u_h = -7.0;

    	public double travelTimeTram_u_h = -4.849609430935352;

    	@Parameter

    	public double travelTimeOther_u_h = -7.0;

    	public double travelTimeOther_u_h = -2.8470557962683523;

    	@Parameter

    	public double perTransfer_u = -1.0;

    	public double perTransfer_u = -0.47539778048347203;

    	@Parameter

    	public double waitTime_u_h = -6.0;

    	public double waitTime_u_h = -17.935075050105493;

    	@Parameter

    	public double walkTime_u_h = -7.0;

    	public double walkTime_u_h = -4.198783720934392;

    }

core/src/main/java/org/eqasim/core/scenario/preparation/AdjustFreespeed.java

-Original file line number
+Diff line change
@@ -0,0 +1,40 @@
+    package org.eqasim.core.scenario.preparation;
+    import org.matsim.api.core.v01.Scenario;
+    import org.matsim.api.core.v01.network.Link;
+    import org.matsim.api.core.v01.network.Network;
+    import org.matsim.core.config.CommandLine;
+    import org.matsim.core.config.CommandLine.ConfigurationException;
+    public class AdjustFreespeed {
+    	static public final String INITIAL_FREESPEED = "eqasim:initialFreespeed";
+    	static public void main(String[] args) throws ConfigurationException {
+    		CommandLine commandLine = new CommandLine.Builder(args) //
+    				.requireOptions("input-path", "output-path") //
+    				.allowPrefixes("freespeed") //
+    				.build();
+    	}
+    	static public void run(Network network) {
+    	}
+    	static public void validate(Scenario scenario) {
+    		boolean valid = false;
+    		for (Link link : scenario.getNetwork().getLinks().values()) {
+    			if (link.getAttributes().getAttribute(INITIAL_FREESPEED) != null) {
+    				valid = true;
+    				break;
+    			}
+    		}
+    		if (!valid) {
+    			throw new IllegalStateException("Did not find initial freespeed. Did you call AdjustFreespeed?");
+    		}
+    	}
+    }

core/src/main/java/org/eqasim/core/scenario/spatial/ImputeSpatialAttribute.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,8 @@ @@
     import org.matsim.api.core.v01.population.Population;
     import org.matsim.core.router.TripStructureUtils;
     import org.matsim.core.router.TripStructureUtils.StageActivityHandling;
+    import org.matsim.pt.transitSchedule.api.TransitSchedule;
+    import org.matsim.pt.transitSchedule.api.TransitStopFacility;
     public class ImputeSpatialAttribute {
     	private final Geometry geometry;
@@ Expand All @@
     		for (Person person : population.getPersons().values()) {
     			for (Plan plan : person.getPlans()) {
-    				for (Activity activity : TripStructureUtils.getActivities(plan, StageActivityHandling.ExcludeStageActivities)) {
+    				for (Activity activity : TripStructureUtils.getActivities(plan,
+    						StageActivityHandling.ExcludeStageActivities)) {
     					Point point = factory
     							.createPoint(new Coordinate(activity.getCoord().getX(), activity.getCoord().getY()));
     					if (geometry.contains(point)) {
     						activity.getAttributes().putAttribute(attribute, true);
+    						if (activity.getType().equals("home")) {
+    							person.getAttributes().putAttribute(attribute, true);
+    						}
     					}
     				}
     			}
@@ Expand All @@
     		progress.close();
     	}
+    	public void run(TransitSchedule schedule) throws InterruptedException {
+    		ParallelProgress progress = new ParallelProgress("Imputing spatial schedule attributes ...",
+    				schedule.getFacilities().size());
+    		for (TransitStopFacility facility : schedule.getFacilities().values()) {
+    			Point point = factory.createPoint(new Coordinate(facility.getCoord().getX(), facility.getCoord().getY()));
+    			if (geometry.covers(point)) {
+    				facility.getAttributes().putAttribute(attribute, true);
+    			}
+    			progress.update();
+    		}
+    		progress.close();
+    	}
     }

core/src/main/java/org/eqasim/core/scenario/spatial/RunImputeSpatialAttribute.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -18,14 +18,17 @@ @@
     import org.matsim.core.population.io.PopulationReader;
     import org.matsim.core.population.io.PopulationWriter;
     import org.matsim.core.scenario.ScenarioUtils;
+    import org.matsim.pt.transitSchedule.api.TransitScheduleReader;
+    import org.matsim.pt.transitSchedule.api.TransitScheduleWriter;
     public class RunImputeSpatialAttribute {
     	static public void main(String[] args)
     			throws ConfigurationException, MalformedURLException, IOException, InterruptedException {
     		CommandLine cmd = new CommandLine.Builder(args) //
     				.allowOptions("input-population-path", "input-network-path", "output-population-path",
-    						"output-network-path") //
-    				.requireOptions("shape-path", "shape-attribute", "shape-value", "attribute", EqasimConfigurator.CONFIGURATOR) //
+    						"output-network-path", "input-schedule-path", "output-schedule-path",
+    						EqasimConfigurator.CONFIGURATOR) //
+    				.requireOptions("shape-path", "shape-attribute", "shape-value", "attribute") //
     				.build();
     		if (cmd.hasOption("input-population-path") ^ cmd.hasOption("output-population-path")) {
@@ Expand All / @@ -36,6 +39,10 @@ static public void main(String[] args) @@
     			throw new IllegalStateException("Both input and output path must be given for the network.");
     		}
+    		if (cmd.hasOption("input-schedule-path") ^ cmd.hasOption("output-schedule-path")) {
+    			throw new IllegalStateException("Both input and output path must be given for the schedule.");
+    		}
     		// Load shape
     		String shapeAttribute = cmd.getOptionStrict("shape-attribute");
     		String shapeValue = cmd.getOptionStrict("shape-value");
@@ Expand Down Expand Up / @@ -68,5 +75,14 @@ static public void main(String[] args) @@
     			algorithm.run(scenario.getPopulation());
     			new PopulationWriter(scenario.getPopulation()).write(cmd.getOptionStrict("output-population-path"));
     		}
+    		// Load schedule
+    		if (cmd.hasOption("input-schedule-path")) {
+    			File populationPath = new File(cmd.getOptionStrict("input-schedule-path"));
+    			new TransitScheduleReader(scenario).readFile(populationPath.toString());
+    			algorithm.run(scenario.getTransitSchedule());
+    			new TransitScheduleWriter(scenario.getTransitSchedule())
+    					.writeFile(cmd.getOptionStrict("output-schedule-path"));
+    		}
     	}
     }

.../java/org/eqasim/core/simulation/mode_choice/cost/AbstractCostModelWithPreviousTrips.java

-Original file line number
+Diff line change
@@ -0,0 +1,8 @@
+    package org.eqasim.core.simulation.mode_choice.cost;
+    public abstract class AbstractCostModelWithPreviousTrips extends AbstractCostModel
+    		implements CostModelWithPreviousTrips {
+    	protected AbstractCostModelWithPreviousTrips(String mode) {
+    		super(mode);
+    	}
+    }

...src/main/java/org/eqasim/core/simulation/mode_choice/cost/CostModelWithPreviousTrips.java

-Original file line number
+Diff line change
@@ -0,0 +1,13 @@
+    package org.eqasim.core.simulation.mode_choice.cost;
+    import java.util.List;
+    import org.matsim.api.core.v01.population.Person;
+    import org.matsim.api.core.v01.population.PlanElement;
+    import org.matsim.contribs.discrete_mode_choice.model.DiscreteModeChoiceTrip;
+    import org.matsim.contribs.discrete_mode_choice.model.trip_based.candidates.TripCandidate;
+    public interface CostModelWithPreviousTrips extends CostModel {
+    	double calculateCost_MU(Person person, DiscreteModeChoiceTrip trip, List<? extends PlanElement> elements,
+    			List<TripCandidate> previousTrips);
+    }

core/src/main/java/org/eqasim/core/simulation/mode_choice/epsilon/AdaptConfigForEpsilon.java

-Original file line number
+Diff line change
@@ Expand Up @@
             Config config = ConfigUtils.loadConfig(commandLine.getOptionStrict("input-config-path"), new EqasimConfigGroup(), new DiscreteModeChoiceConfigGroup());
             commandLine.applyConfiguration(config);
+            run(config);
+            ConfigUtils.writeConfig(config, commandLine.getOptionStrict("output-config-path"));
+        }
+        static public void run(Config config) {
             DiscreteModeChoiceConfigGroup discreteModeChoiceConfigGroup = (DiscreteModeChoiceConfigGroup) config.getModules().get(DiscreteModeChoiceConfigGroup.GROUP_NAME);
             discreteModeChoiceConfigGroup.setSelector(SelectorModule.MAXIMUM);
             EqasimConfigGroup eqasimConfigGroup = (EqasimConfigGroup) config.getModules().get(EqasimConfigGroup.GROUP_NAME);
             eqasimConfigGroup.setUsePseudoRandomErrors(true);
-            ConfigUtils.writeConfig(config, commandLine.getOptionStrict("output-config-path"));
         }
     }

...rc/main/java/org/eqasim/core/simulation/mode_choice/utilities/EqasimUtilityEstimator.java

-Original file line number
+Diff line change
@@ Expand Up @@
     		if (estimator == null) {
     			throw new IllegalStateException(String.format("No estimator registered for mode '%s'", mode));
     		} else {
-    			double utility = estimator.estimateUtility(person, trip, elements);
+    			double utility = 0.0;
+    			if (estimator instanceof UtilityEstimatorWithPreviousTrips withPreviousTrips) {
+    				utility += withPreviousTrips.estimateUtility(person, trip, elements, previousTrips);
+    			} else {
+    				utility += estimator.estimateUtility(person, trip, elements);
+    			}
     			utility += epsilonProvider.getEpsilon(person.getId(), trip.getIndex(), mode);
     			utility -= utilityPenalty.calculatePenalty(mode, person, trip, elements);
     			return utility;
@@ Expand Down @@

...a/org/eqasim/core/simulation/mode_choice/utilities/UtilityEstimatorWithPreviousTrips.java

-Original file line number
+Diff line change
@@ -0,0 +1,13 @@
+    package org.eqasim.core.simulation.mode_choice.utilities;
+    import java.util.List;
+    import org.matsim.api.core.v01.population.Person;
+    import org.matsim.api.core.v01.population.PlanElement;
+    import org.matsim.contribs.discrete_mode_choice.model.DiscreteModeChoiceTrip;
+    import org.matsim.contribs.discrete_mode_choice.model.trip_based.candidates.TripCandidate;
+    public interface UtilityEstimatorWithPreviousTrips extends UtilityEstimator {
+    	double estimateUtility(Person person, DiscreteModeChoiceTrip trip, List<? extends PlanElement> elements,
+    			List<TripCandidate> previousTrips);
+    }

...java/org/eqasim/core/simulation/mode_choice/utilities/estimators/CarUtilityEstimator.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,16 +3,17 @@
  
    import java.util.List;

    import org.eqasim.core.simulation.mode_choice.parameters.ModeParameters;

    import org.eqasim.core.simulation.mode_choice.utilities.UtilityEstimator;

    import org.eqasim.core.simulation.mode_choice.utilities.UtilityEstimatorWithPreviousTrips;

    import org.eqasim.core.simulation.mode_choice.utilities.predictors.CarPredictor;

    import org.eqasim.core.simulation.mode_choice.utilities.variables.CarVariables;

    import org.matsim.api.core.v01.population.Person;

    import org.matsim.api.core.v01.population.PlanElement;

    import org.matsim.contribs.discrete_mode_choice.model.DiscreteModeChoiceTrip;

    import org.matsim.contribs.discrete_mode_choice.model.trip_based.candidates.TripCandidate;

    import com.google.inject.Inject;

    public class CarUtilityEstimator implements UtilityEstimator {

    public class CarUtilityEstimator implements UtilityEstimatorWithPreviousTrips {

    	private final ModeParameters parameters;

    	private final CarPredictor predictor;

    @@ -40,8 +41,9 @@ protected double estimateMonetaryCostUtility(CarVariables variables) {
  
    	}

    	@Override

    	public double estimateUtility(Person person, DiscreteModeChoiceTrip trip, List<? extends PlanElement> elements) {

    		CarVariables variables = predictor.predictVariables(person, trip, elements);

    	public double estimateUtility(Person person, DiscreteModeChoiceTrip trip, List<? extends PlanElement> elements,

    			List<TripCandidate> previousTrips) {

    		CarVariables variables = predictor.predictVariables(person, trip, elements, previousTrips);

    		double utility = 0.0;

    @@ -52,4 +54,9 @@ public double estimateUtility(Person person, DiscreteModeChoiceTrip trip, List<?
  
    		return utility;

    	}

    	@Override

    	public double estimateUtility(Person person, DiscreteModeChoiceTrip trip, List<? extends PlanElement> elements) {

    		throw new IllegalStateException("Need to provide previous trips");

    	}

    }

...simulation/mode_choice/utilities/predictors/CachedVariablePredictorWithPreviousTrips.java

-Original file line number
+Diff line change
@@ -0,0 +1,29 @@
+    package org.eqasim.core.simulation.mode_choice.utilities.predictors;
+    import java.util.List;
+    import org.eqasim.core.simulation.mode_choice.utilities.variables.BaseVariables;
+    import org.matsim.api.core.v01.population.Person;
+    import org.matsim.api.core.v01.population.PlanElement;
+    import org.matsim.contribs.discrete_mode_choice.model.DiscreteModeChoiceTrip;
+    import org.matsim.contribs.discrete_mode_choice.model.trip_based.candidates.TripCandidate;
+    public abstract class CachedVariablePredictorWithPreviousTrips<T extends BaseVariables>
+    		implements VariablePredictorWithPreviousTrips<T> {
+    	private DiscreteModeChoiceTrip cacheKey = null;
+    	private T cacheValue = null;
+    	@Override
+    	public T predictVariables(Person person, DiscreteModeChoiceTrip trip, List<? extends PlanElement> elements,
+    			List<TripCandidate> previousTrips) {
+    		if (trip != cacheKey) {
+    			cacheKey = trip;
+    			cacheValue = predict(person, trip, elements, previousTrips);
+    		}
+    		return cacheValue;
+    	}
+    	protected abstract T predict(Person person, DiscreteModeChoiceTrip trip, List<? extends PlanElement> elements,
+    			List<TripCandidate> previousTrips);
+    }

...c/main/java/org/eqasim/core/simulation/mode_choice/utilities/predictors/CarPredictor.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,20 +3,22 @@ @@
     import java.util.List;
     import org.eqasim.core.simulation.mode_choice.cost.CostModel;
+    import org.eqasim.core.simulation.mode_choice.cost.CostModelWithPreviousTrips;
     import org.eqasim.core.simulation.mode_choice.parameters.ModeParameters;
     import org.eqasim.core.simulation.mode_choice.utilities.variables.CarVariables;
     import org.matsim.api.core.v01.TransportMode;
     import org.matsim.api.core.v01.population.Leg;
     import org.matsim.api.core.v01.population.Person;
     import org.matsim.api.core.v01.population.PlanElement;
     import org.matsim.contribs.discrete_mode_choice.model.DiscreteModeChoiceTrip;
+    import org.matsim.contribs.discrete_mode_choice.model.trip_based.candidates.TripCandidate;
     import org.matsim.core.router.TripStructureUtils;
     import com.google.common.base.Verify;
     import com.google.inject.Inject;
     import com.google.inject.name.Named;
-    public class CarPredictor extends CachedVariablePredictor<CarVariables> {
+    public class CarPredictor extends CachedVariablePredictorWithPreviousTrips<CarVariables> {
     	private final CostModel costModel;
     	private final ModeParameters parameters;
@@ Expand All @@
     	}
     	@Override
-    	public CarVariables predict(Person person, DiscreteModeChoiceTrip trip, List<? extends PlanElement> elements) {
+    	public CarVariables predict(Person person, DiscreteModeChoiceTrip trip, List<? extends PlanElement> elements,
+    			List<TripCandidate> previousTrips) {
     		double carTravelTime_min = parameters.car.constantParkingSearchPenalty_min;
     		double accessEgressTime_min = parameters.car.additionalAccessEgressWalkTime_min;
@@ Expand All @@
     			}
     		}
-    		double cost_MU = costModel.calculateCost_MU(person, trip, elements);
+    		final double cost_MU;
+    		if (costModel instanceof CostModelWithPreviousTrips) {
+    			cost_MU = ((CostModelWithPreviousTrips) costModel).calculateCost_MU(person, trip, elements, previousTrips);
+    		} else {
+    			cost_MU = costModel.calculateCost_MU(person, trip, elements);
+    		}
     		double euclideanDistance_km = PredictorUtils.calculateEuclideanDistance_km(trip);
     		return new CarVariables(carTravelTime_min, cost_MU, euclideanDistance_km, accessEgressTime_min);
@@ Expand Down @@

.../core/simulation/mode_choice/utilities/predictors/VariablePredictorWithPreviousTrips.java

-Original file line number
+Diff line change
@@ -0,0 +1,14 @@
+    package org.eqasim.core.simulation.mode_choice.utilities.predictors;
+    import java.util.List;
+    import org.eqasim.core.simulation.mode_choice.utilities.variables.BaseVariables;
+    import org.matsim.api.core.v01.population.Person;
+    import org.matsim.api.core.v01.population.PlanElement;
+    import org.matsim.contribs.discrete_mode_choice.model.DiscreteModeChoiceTrip;
+    import org.matsim.contribs.discrete_mode_choice.model.trip_based.candidates.TripCandidate;
+    public interface VariablePredictorWithPreviousTrips<T extends BaseVariables> {
+    	T predictVariables(Person person, DiscreteModeChoiceTrip trip, List<? extends PlanElement> elements,
+    			List<TripCandidate> previousTrips);
+    }

core/src/main/java/org/eqasim/core/simulation/vdf/VDFModule.java

-Original file line number
+Diff line change
@@ Expand Up @@
     				: new ShapeScenarioExtent.Builder(new File(ConfigGroup
     						.getInputFileURL(getConfig().getContext(), config.getUpdateAreaShapefile()).getPath()),
     						Optional.empty(), Optional.empty()).build();
     		VDFTravelTime vdfTravelTime = new VDFTravelTime(scope, config.getMinimumSpeed(), config.getCapacityFactor(),
     				eqasimConfig.getSampleSize(), network, vdf, crossingPenalty, updateExtent);
     		if (config.getInputTravelTimesFile() != null) {
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: model update 2024 #266

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

feat: model update 2024 #266

Are you sure you want to change the base?

Uh oh!

feat: model update 2024 #266

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!