Skip to content

Commit 18b3925

Browse files
sebhoerlsebhoerl
committed
rename passenger -> car_passenger
1 parent 9d5623f commit 18b3925

File tree

7 files changed

+31
-35
lines changed

7 files changed

+31
-35
lines changed

‎ile_de_france/src/main/java/org/eqasim/ile_de_france/mode_choice/IDFModeAvailability.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public Collection<String> getAvailableModes(Person person, List<DiscreteModeChoi
1818
// Modes that are always available
1919
modes.add(TransportMode.walk);
2020
modes.add(TransportMode.pt);
21-
modes.add(IDFModeChoiceModule.PASSENGER);
21+
modes.add(IDFModeChoiceModule.CAR_PASSENGER);
2222

2323
// Check car availability
2424
if (IDFPredictorUtils.hasCarAvailability(person) && IDFPredictorUtils.hasDrivingLicense(person)) {

‎ile_de_france/src/main/java/org/eqasim/ile_de_france/mode_choice/IDFModeChoiceModule.java

+6-10
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,21 @@
33
import java.io.File;
44
import java.io.IOException;
55
import java.util.List;
6-
import java.util.Map;
76

87
import org.eqasim.core.components.config.EqasimConfigGroup;
98
import org.eqasim.core.simulation.mode_choice.AbstractEqasimExtension;
109
import org.eqasim.core.simulation.mode_choice.ParameterDefinition;
11-
import org.eqasim.core.simulation.mode_choice.cost.CostModel;
1210
import org.eqasim.core.simulation.mode_choice.parameters.ModeParameters;
1311
import org.eqasim.core.simulation.mode_choice.tour_finder.ActivityTourFinderWithExcludedActivities;
1412
import org.eqasim.core.simulation.mode_choice.utilities.estimators.BikeUtilityEstimator;
1513
import org.eqasim.ile_de_france.mode_choice.costs.IDFCarCostModel;
1614
import org.eqasim.ile_de_france.mode_choice.costs.IDFPtCostModel;
1715
import org.eqasim.ile_de_france.mode_choice.parameters.IDFCostParameters;
1816
import org.eqasim.ile_de_france.mode_choice.parameters.IDFModeParameters;
17+
import org.eqasim.ile_de_france.mode_choice.utilities.estimators.IDFCarPassengerUtilityEstimator;
1918
import org.eqasim.ile_de_france.mode_choice.utilities.estimators.IDFCarUtilityEstimator;
20-
import org.eqasim.ile_de_france.mode_choice.utilities.estimators.IDFPassengerUtilityEstimator;
2119
import org.eqasim.ile_de_france.mode_choice.utilities.estimators.IDFPtUtilityEstimator;
22-
import org.eqasim.ile_de_france.mode_choice.utilities.predictors.IDFPassengerPredictor;
20+
import org.eqasim.ile_de_france.mode_choice.utilities.predictors.IDFCarPassengerPredictor;
2321
import org.eqasim.ile_de_france.mode_choice.utilities.predictors.IDFPersonPredictor;
2422
import org.eqasim.ile_de_france.mode_choice.utilities.predictors.IDFPtPredictor;
2523
import org.matsim.contribs.discrete_mode_choice.components.tour_finder.ActivityTourFinder;
@@ -28,10 +26,8 @@
2826
import org.matsim.core.config.CommandLine;
2927
import org.matsim.core.config.CommandLine.ConfigurationException;
3028

31-
import com.google.inject.Provider;
3229
import com.google.inject.Provides;
3330
import com.google.inject.Singleton;
34-
import com.google.inject.name.Named;
3531

3632
public class IDFModeChoiceModule extends AbstractEqasimExtension {
3733
private final CommandLine commandLine;
@@ -42,11 +38,11 @@ public class IDFModeChoiceModule extends AbstractEqasimExtension {
4238
public static final String PT_COST_MODEL_NAME = "IDFPtCostModel";
4339

4440
public static final String CAR_ESTIMATOR_NAME = "IDFCarUtilityEstimator";
45-
public static final String PASSENGER_ESTIMATOR_NAME = "IDFPassengerUtilityEstimator";
41+
public static final String CAR_PASSENGER_ESTIMATOR_NAME = "IDFCarPassengerUtilityEstimator";
4642
public static final String BICYCLE_ESTIMATOR_NAME = "IDFBicycleUtilityEstimator";
4743
public static final String PT_ESTIMATOR_NAME = "IDFPtUtilityEstimator";
4844

49-
static public final String PASSENGER = "passenger";
45+
static public final String CAR_PASSENGER = "car_passenger";
5046
static public final String BICYCLE = "bicycle";
5147

5248
public static final String ISOLATED_OUTSIDE_TOUR_FINDER_NAME = "IsolatedOutsideTrips";
@@ -60,15 +56,15 @@ protected void installEqasimExtension() {
6056
bindModeAvailability(MODE_AVAILABILITY_NAME).to(IDFModeAvailability.class);
6157

6258
bind(IDFPersonPredictor.class);
63-
bind(IDFPassengerPredictor.class);
59+
bind(IDFCarPassengerPredictor.class);
6460
bind(IDFPtPredictor.class);
6561

6662
bindCostModel(CAR_COST_MODEL_NAME).to(IDFCarCostModel.class);
6763
bindCostModel(PT_COST_MODEL_NAME).to(IDFPtCostModel.class);
6864

6965
bindUtilityEstimator(CAR_ESTIMATOR_NAME).to(IDFCarUtilityEstimator.class);
7066
bindUtilityEstimator(BICYCLE_ESTIMATOR_NAME).to(BikeUtilityEstimator.class);
71-
bindUtilityEstimator(PASSENGER_ESTIMATOR_NAME).to(IDFPassengerUtilityEstimator.class);
67+
bindUtilityEstimator(CAR_PASSENGER_ESTIMATOR_NAME).to(IDFCarPassengerUtilityEstimator.class);
7268
bindUtilityEstimator(PT_ESTIMATOR_NAME).to(IDFPtUtilityEstimator.class);
7369

7470
bind(ModeParameters.class).to(IDFModeParameters.class);

‎ile_de_france/src/main/java/org/eqasim/ile_de_france/mode_choice/parameters/IDFModeParameters.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ public class IDFCarParameters {
99

1010
public final IDFCarParameters idfCar = new IDFCarParameters();
1111

12-
public class IDFPassengerParameters {
12+
public class IDFCarPassengerParameters {
1313
public double alpha_u;
1414
public double betaInVehicleTravelTime_u_min;
1515
public double betaDrivingPermit_u;
1616
}
1717

18-
public final IDFPassengerParameters idfPassenger = new IDFPassengerParameters();
18+
public final IDFCarPassengerParameters idfCarPassenger = new IDFCarPassengerParameters();
1919

2020
public class IDFPtParameters {
2121
public double betaDrivingPermit_u;
@@ -44,9 +44,9 @@ public static IDFModeParameters buildDefault() {
4444
parameters.idfCar.betaInVehicleTravelTime_u_min = -0.0262;
4545

4646
// Car passenger
47-
parameters.idfPassenger.alpha_u = -2.08;
48-
parameters.idfPassenger.betaDrivingPermit_u = -1.17;
49-
parameters.idfPassenger.betaInVehicleTravelTime_u_min = -0.0608;
47+
parameters.idfCarPassenger.alpha_u = -2.08;
48+
parameters.idfCarPassenger.betaDrivingPermit_u = -1.17;
49+
parameters.idfCarPassenger.betaInVehicleTravelTime_u_min = -0.0608;
5050

5151
// PT
5252
parameters.pt.alpha_u = 0.0;

‎ile_de_france/src/main/java/org/eqasim/ile_de_france/mode_choice/utilities/estimators/IDFPassengerUtilityEstimator.java renamed to ‎ile_de_france/src/main/java/org/eqasim/ile_de_france/mode_choice/utilities/estimators/IDFCarPassengerUtilityEstimator.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,39 @@
44

55
import org.eqasim.core.simulation.mode_choice.utilities.UtilityEstimator;
66
import org.eqasim.ile_de_france.mode_choice.parameters.IDFModeParameters;
7-
import org.eqasim.ile_de_france.mode_choice.utilities.predictors.IDFPassengerPredictor;
8-
import org.eqasim.ile_de_france.mode_choice.utilities.variables.IDFPassengerVariables;
7+
import org.eqasim.ile_de_france.mode_choice.utilities.predictors.IDFCarPassengerPredictor;
8+
import org.eqasim.ile_de_france.mode_choice.utilities.variables.IDFCarPassengerVariables;
99
import org.matsim.api.core.v01.population.Person;
1010
import org.matsim.api.core.v01.population.PlanElement;
1111
import org.matsim.contribs.discrete_mode_choice.model.DiscreteModeChoiceTrip;
1212

1313
import com.google.inject.Inject;
1414

15-
public class IDFPassengerUtilityEstimator implements UtilityEstimator {
15+
public class IDFCarPassengerUtilityEstimator implements UtilityEstimator {
1616
private final IDFModeParameters parameters;
17-
private final IDFPassengerPredictor predictor;
17+
private final IDFCarPassengerPredictor predictor;
1818

1919
@Inject
20-
public IDFPassengerUtilityEstimator(IDFModeParameters parameters, IDFPassengerPredictor predictor) {
20+
public IDFCarPassengerUtilityEstimator(IDFModeParameters parameters, IDFCarPassengerPredictor predictor) {
2121
this.parameters = parameters;
2222
this.predictor = predictor;
2323
}
2424

2525
protected double estimateConstantUtility() {
26-
return parameters.idfPassenger.alpha_u;
26+
return parameters.idfCarPassenger.alpha_u;
2727
}
2828

29-
protected double estimateTravelTimeUtility(IDFPassengerVariables variables) {
30-
return parameters.idfPassenger.betaInVehicleTravelTime_u_min * variables.travelTime_min;
29+
protected double estimateTravelTimeUtility(IDFCarPassengerVariables variables) {
30+
return parameters.idfCarPassenger.betaInVehicleTravelTime_u_min * variables.travelTime_min;
3131
}
3232

33-
protected double estimateAccessEgressTimeUtility(IDFPassengerVariables variables) {
33+
protected double estimateAccessEgressTimeUtility(IDFCarPassengerVariables variables) {
3434
return parameters.betaAccessTime_u_min * variables.accessEgressTime_min;
3535
}
3636

3737
@Override
3838
public double estimateUtility(Person person, DiscreteModeChoiceTrip trip, List<? extends PlanElement> elements) {
39-
IDFPassengerVariables variables = predictor.predictVariables(person, trip, elements);
39+
IDFCarPassengerVariables variables = predictor.predictVariables(person, trip, elements);
4040

4141
double utility = 0.0;
4242

‎ile_de_france/src/main/java/org/eqasim/ile_de_france/mode_choice/utilities/predictors/IDFPassengerPredictor.java renamed to ‎ile_de_france/src/main/java/org/eqasim/ile_de_france/mode_choice/utilities/predictors/IDFCarPassengerPredictor.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.eqasim.core.simulation.mode_choice.utilities.predictors.CachedVariablePredictor;
66
import org.eqasim.core.simulation.mode_choice.utilities.predictors.PredictorUtils;
77
import org.eqasim.ile_de_france.mode_choice.IDFModeChoiceModule;
8-
import org.eqasim.ile_de_france.mode_choice.utilities.variables.IDFPassengerVariables;
8+
import org.eqasim.ile_de_france.mode_choice.utilities.variables.IDFCarPassengerVariables;
99
import org.matsim.api.core.v01.TransportMode;
1010
import org.matsim.api.core.v01.population.Leg;
1111
import org.matsim.api.core.v01.population.Person;
@@ -15,17 +15,17 @@
1515

1616
import com.google.common.base.Verify;
1717

18-
public class IDFPassengerPredictor extends CachedVariablePredictor<IDFPassengerVariables> {
18+
public class IDFCarPassengerPredictor extends CachedVariablePredictor<IDFCarPassengerVariables> {
1919
@Override
20-
public IDFPassengerVariables predict(Person person, DiscreteModeChoiceTrip trip,
20+
public IDFCarPassengerVariables predict(Person person, DiscreteModeChoiceTrip trip,
2121
List<? extends PlanElement> elements) {
2222
double passengerTravelTime_min = 0.0;
2323
double accessEgressTime_min = 0.0;
2424

2525
boolean foundCar = false;
2626

2727
for (Leg leg : TripStructureUtils.getLegs(elements)) {
28-
if (leg.getMode().equals(IDFModeChoiceModule.PASSENGER)) {
28+
if (leg.getMode().equals(IDFModeChoiceModule.CAR_PASSENGER)) {
2929
Verify.verify(!foundCar);
3030
passengerTravelTime_min += leg.getTravelTime().seconds() / 60.0;
3131
} else if (leg.getMode().equals(TransportMode.walk)) {
@@ -37,6 +37,6 @@ public IDFPassengerVariables predict(Person person, DiscreteModeChoiceTrip trip,
3737

3838
double euclideanDistance_km = PredictorUtils.calculateEuclideanDistance_km(trip);
3939

40-
return new IDFPassengerVariables(passengerTravelTime_min, euclideanDistance_km, accessEgressTime_min);
40+
return new IDFCarPassengerVariables(passengerTravelTime_min, euclideanDistance_km, accessEgressTime_min);
4141
}
4242
}

‎ile_de_france/src/main/java/org/eqasim/ile_de_france/mode_choice/utilities/variables/IDFPassengerVariables.java renamed to ‎ile_de_france/src/main/java/org/eqasim/ile_de_france/mode_choice/utilities/variables/IDFCarPassengerVariables.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import org.eqasim.core.simulation.mode_choice.utilities.variables.BaseVariables;
44

5-
public class IDFPassengerVariables implements BaseVariables {
5+
public class IDFCarPassengerVariables implements BaseVariables {
66
final public double travelTime_min;
77
final public double euclideanDistance_km;
88
final public double accessEgressTime_min;
99

10-
public IDFPassengerVariables(double travelTime_min, double euclideanDistance_km, double accessEgressTime_min) {
10+
public IDFCarPassengerVariables(double travelTime_min, double euclideanDistance_km, double accessEgressTime_min) {
1111
this.travelTime_min = travelTime_min;
1212
this.euclideanDistance_km = euclideanDistance_km;
1313
this.accessEgressTime_min = accessEgressTime_min;

‎ile_de_france/src/main/java/org/eqasim/ile_de_france/scenario/RunAdaptConfig.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ static public void adaptConfiguration(Config config, String prefix) {
5858

5959
eqasimConfig.setEstimator(TransportMode.car, IDFModeChoiceModule.CAR_ESTIMATOR_NAME);
6060
eqasimConfig.setEstimator(IDFModeChoiceModule.BICYCLE, IDFModeChoiceModule.BICYCLE_ESTIMATOR_NAME);
61-
eqasimConfig.setEstimator(IDFModeChoiceModule.PASSENGER, IDFModeChoiceModule.PASSENGER_ESTIMATOR_NAME);
61+
eqasimConfig.setEstimator(IDFModeChoiceModule.CAR_PASSENGER, IDFModeChoiceModule.CAR_PASSENGER_ESTIMATOR_NAME);
6262
eqasimConfig.removeEstimator(TransportMode.bike);
6363

6464
// Discrete mode choice
@@ -89,6 +89,6 @@ static public void adaptConfiguration(Config config, String prefix) {
8989

9090
// Convergence
9191
EqasimTerminationConfigGroup terminationConfig = EqasimTerminationConfigGroup.getOrCreate(config);
92-
terminationConfig.setModes(Arrays.asList("car", "passenger", "pt", "bicycle", "walk"));
92+
terminationConfig.setModes(Arrays.asList("car", "car_passenger", "pt", "bicycle", "walk"));
9393
}
9494
}

0 commit comments

Comments
 (0)