Skip to content

feat: replace EqasimVehicleTourConstraint with VehicleTourConstraint #541

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.

Sign up for GitHub

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

Merged
sebhoerl merged 3 commits into from
Mar 5, 2026
Merged

feat: replace EqasimVehicleTourConstraint with VehicleTourConstraint #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4a40ea
feat: replace EqasimVehicleTourConstraint with VehicleTourConstraint
sebhoerl Mar 4, 2026
48f053a
fixes
sebhoerl Mar 4, 2026
da1561f
Merge branch 'develop' into feat/replace-vehicle-tour-constraint
sebhoerl Mar 5, 2026
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
2 changes: 1 addition & 1 deletion core/src/main/java/org/eqasim/core/scenario/config/GenerateConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ protected void adaptConfiguration(Config config) {
dmcConfig.setModeAvailability("unknown");

dmcConfig.setTourConstraints(
Arrays.asList(EqasimModeChoiceModule.VEHICLE_TOUR_CONSTRAINT, ConstraintModule.FROM_TRIP_BASED));
Arrays.asList(ConstraintModule.VEHICLE_CONTINUITY, ConstraintModule.FROM_TRIP_BASED));
dmcConfig.setTripConstraints(Arrays.asList(ConstraintModule.TRANSIT_WALK,
EqasimModeChoiceModule.PASSENGER_CONSTRAINT_NAME, EqasimModeChoiceModule.OUTSIDE_CONSTRAINT_NAME));

Expand Down
28 changes: 12 additions & 16 deletions core/src/main/java/org/eqasim/core/simulation/mode_choice/EqasimModeChoiceModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import java.util.stream.Collectors;

import org.eqasim.core.components.config.EqasimConfigGroup;
import org.eqasim.core.simulation.mode_choice.constraints.EqasimVehicleTourConstraint;
import org.eqasim.core.simulation.mode_choice.constraints.OutsideConstraint;
import org.eqasim.core.simulation.mode_choice.constraints.PassengerConstraint;
import org.eqasim.core.simulation.mode_choice.cost.CostModel;
Expand All @@ -17,26 +16,33 @@
import org.eqasim.core.simulation.mode_choice.parameters.ModeParameters;
import org.eqasim.core.simulation.mode_choice.utilities.EqasimUtilityEstimator;
import org.eqasim.core.simulation.mode_choice.utilities.UtilityEstimator;
import org.eqasim.core.simulation.mode_choice.utilities.estimators.*;
import org.eqasim.core.simulation.mode_choice.utilities.predictors.*;
import org.eqasim.core.simulation.mode_choice.utilities.estimators.BikeUtilityEstimator;
import org.eqasim.core.simulation.mode_choice.utilities.estimators.CarUtilityEstimator;
import org.eqasim.core.simulation.mode_choice.utilities.estimators.MotorcycleUtilityEstimator;
import org.eqasim.core.simulation.mode_choice.utilities.estimators.PtUtilityEstimator;
import org.eqasim.core.simulation.mode_choice.utilities.estimators.WalkUtilityEstimator;
import org.eqasim.core.simulation.mode_choice.utilities.estimators.ZeroUtilityEstimator;
import org.eqasim.core.simulation.mode_choice.utilities.predictors.BikePredictor;
import org.eqasim.core.simulation.mode_choice.utilities.predictors.CarPredictor;
import org.eqasim.core.simulation.mode_choice.utilities.predictors.MotorcyclePredictor;
import org.eqasim.core.simulation.mode_choice.utilities.predictors.PersonPredictor;
import org.eqasim.core.simulation.mode_choice.utilities.predictors.PtPredictor;
import org.eqasim.core.simulation.mode_choice.utilities.predictors.WalkPredictor;
import org.eqasim.core.simulation.modes.drt.mode_choice.constraints.DrtServiceAreaConstraint;
import org.eqasim.core.simulation.modes.drt.mode_choice.constraints.DrtWalkConstraint;
import org.eqasim.core.simulation.modes.drt.mode_choice.predictors.DefaultDrtPredictor;
import org.eqasim.core.simulation.modes.drt.mode_choice.predictors.DrtPredictor;
import org.eqasim.core.simulation.modes.drt.mode_choice.utilities.estimators.DrtUtilityEstimator;
import org.eqasim.core.simulation.policies.utility.UtilityPenalty;
import org.matsim.contrib.drt.run.MultiModeDrtConfigGroup;
import org.matsim.contribs.discrete_mode_choice.components.utils.home_finder.HomeFinder;
import org.matsim.contribs.discrete_mode_choice.modules.config.DiscreteModeChoiceConfigGroup;
import org.matsim.contribs.discrete_mode_choice.modules.config.VehicleTourConstraintConfigGroup;
import org.matsim.core.config.Config;
import org.matsim.core.router.TripRouter;
import org.matsim.core.utils.timing.TimeInterpretation;
import org.matsim.facilities.ActivityFacilities;

import com.google.inject.Provider;
import com.google.inject.Provides;
import com.google.inject.Singleton;
import com.google.inject.name.Named;

public class EqasimModeChoiceModule extends AbstractEqasimExtension {
Expand All @@ -58,7 +64,6 @@ public class EqasimModeChoiceModule extends AbstractEqasimExtension {

public static final String ZERO_COST_MODEL_NAME = "ZeroCostModel";

public static final String VEHICLE_TOUR_CONSTRAINT = "EqasimVehicleTourConstraint";
public static final String HOME_FINDER = "EqasimHomeFinder";

@Override
Expand Down Expand Up @@ -90,7 +95,6 @@ protected void installEqasimExtension() {

bindCostModel(ZERO_COST_MODEL_NAME).to(ZeroCostModel.class);

bindTourConstraintFactory(VEHICLE_TOUR_CONSTRAINT).to(EqasimVehicleTourConstraint.Factory.class);
bindHomeFinder(HOME_FINDER).to(EqasimHomeFinder.class);

install(new EpsilonModule());
Expand Down Expand Up @@ -140,14 +144,6 @@ public CostModel providePtCostModel(Map<String, Provider<CostModel>> factory, Eq
return getCostModel(factory, config, "pt");
}

@Provides
@Singleton
public EqasimVehicleTourConstraint.Factory provideEqasimVehicleTourConstraintFactory(
DiscreteModeChoiceConfigGroup dmcConfig, HomeFinder homeFinder) {
VehicleTourConstraintConfigGroup config = dmcConfig.getVehicleTourConstraintConfig();
return new EqasimVehicleTourConstraint.Factory(config.getRestrictedModes(), homeFinder);
}

@Provides
public DefaultDrtPredictor provideDefaultDrtPredictor(Config config, Map<String, Provider<CostModel>> factory) {
if (!config.getModules().containsKey(MultiModeDrtConfigGroup.GROUP_NAME)) {
Expand Down
151 changes: 0 additions & 151 deletions .../java/org/eqasim/core/simulation/mode_choice/constraints/EqasimVehicleTourConstraint.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion core/src/main/resources/melun/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<!-- Defines which Selector component to use. Built-in choices: Maximum, MultinomialLogit, Random -->
<param name="selector" value="MultinomialLogit" />
<!-- Defines a number of TourConstraint components that should be activated. Built-in choices: FromTripBased, VehicleContinuity, SubtourMode -->
<param name="tourConstraints" value="FromTripBased, EqasimVehicleTourConstraint" />
<param name="tourConstraints" value="FromTripBased, VehicleContinuity" />
<!-- Defines which TourEstimator component to use. Built-in choices: MATSimDayScoring, Cumulative, Uniform -->
<param name="tourEstimator" value="Cumulative" />
<!-- Defines a number of TourFilter components that should be activated. Built-in choices: TourLength -->
Expand Down
2 changes: 1 addition & 1 deletion ile_de_france/src/main/resources/corsica/corsica_config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<!-- Defines which Selector component to use. Built-in choices: Maximum, MultinomialLogit, Random -->
<param name="selector" value="MultinomialLogit" />
<!-- Defines a number of TourConstraint components that should be activated. Built-in choices: FromTripBased, VehicleContinuity, SubtourMode -->
<param name="tourConstraints" value="FromTripBased, EqasimVehicleTourConstraint" />
<param name="tourConstraints" value="FromTripBased, VehicleContinuity" />
<!-- Defines which TourEstimator component to use. Built-in choices: MATSimDayScoring, Cumulative, Uniform -->
<param name="tourEstimator" value="Cumulative" />
<!-- Defines a number of TourFilter components that should be activated. Built-in choices: TourLength -->
Expand Down