Commit f62f383d authored by Sebastian Hörl's avatar Sebastian Hörl
Browse files

Fix penalties in utilities

parent e6abffff
......@@ -244,7 +244,10 @@ public class SwissUtilityEstimator extends BaseUtilityEstimator {
parameters.car.lambdaTravelTimeDistance) //
* tripVariables.travelTime_min;
utility += parameters.car.betaParkingSearchTime * tripVariables.parkingSearchTime_min;
double parkingSearchTime_min = tripVariables.parkingSearchTime_min
+ parameters.car.constantParkingSearchPenalty_min;
utility += parameters.car.betaParkingSearchTime * parkingSearchTime_min;
utility += parameters.betaCost //
* interaction(tripVariables.travelDistance_km, parameters.referenceDistance_km,
parameters.car.lambdaCostDistance) //
......@@ -273,6 +276,8 @@ public class SwissUtilityEstimator extends BaseUtilityEstimator {
parameters.lambdaDelayDistance) //
* tripVariables.delay_min;
utility += parameters.walk.betaTravelTime * parameters.car.constantAccessEgressWalkTime_min;
return utility;
}
......
......@@ -112,7 +112,6 @@ public class SwissUtilityParameters {
public double betaTravelTime = 0.0;
public double betaParkingSearchTime = 0.0;
public double betaParkingCost = 0.0;
public double betaAccessEgressTime = 0.0;
public double betaAlwaysAvailable = 0.0;
......@@ -123,9 +122,9 @@ public class SwissUtilityParameters {
public double lambdaTravelTimeDistance = 0.0;
public double lambdaCostDistance = 0.0;
public double constantAccessEgressWalkTime_min = 0.0;
public double constantParkingSearchPenalty = 0.0;
public double constantParkingSearchPenalty_min = 0.0;
}
public CarParameters car = new CarParameters();
......@@ -162,6 +161,12 @@ public class SwissUtilityParameters {
public PtParameters pt = new PtParameters();
// VI) Private AV
public class PrivateAVParameters extends CarParameters {
}
public PrivateAVParameters prav = new PrivateAVParameters();
/**
* Chapter 3.2.1: Modell with linear utility function WITHOUT sociodemographics
*/
......
package ch.ethz.matsim.projects.astra_2018_002.mode_choice.base;
public class TripVariablesPrivateAv {
public double travelTime_min = 0.0;
public double travelCost_CHF = 0.0;
public double parkingCost_CHF = 0.0;
public double delay_min = 0.0;
public double travelDistance_km = 0.0;
public double crowflyDistance_km = 0.0;
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment