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

Another fix to make baseline run again

parent db800c7d
...@@ -22,6 +22,7 @@ import ch.ethz.matsim.projects.astra_2018_002.mode_choice.cost.CostModel; ...@@ -22,6 +22,7 @@ import ch.ethz.matsim.projects.astra_2018_002.mode_choice.cost.CostModel;
import ch.ethz.matsim.projects.astra_2018_002.mode_choice.cost.CostParameters; import ch.ethz.matsim.projects.astra_2018_002.mode_choice.cost.CostParameters;
import ch.ethz.matsim.projects.astra_2018_002.mode_choice.outside.OutsideConstraint; import ch.ethz.matsim.projects.astra_2018_002.mode_choice.outside.OutsideConstraint;
import ch.ethz.matsim.projects.astra_2018_002.mode_choice.outside.SwissTourFinder; import ch.ethz.matsim.projects.astra_2018_002.mode_choice.outside.SwissTourFinder;
import ch.ethz.matsim.projects.astra_2018_002.shared_av.pricing.DefaultSharedAVTravelCost;
import ch.ethz.matsim.projects.astra_2018_002.shared_av.pricing.SharedAVTravelCost; import ch.ethz.matsim.projects.astra_2018_002.shared_av.pricing.SharedAVTravelCost;
public class SwissDiscreteModeChoiceModule extends AbstractDiscreteModeChoiceExtension { public class SwissDiscreteModeChoiceModule extends AbstractDiscreteModeChoiceExtension {
...@@ -75,6 +76,12 @@ public class SwissDiscreteModeChoiceModule extends AbstractDiscreteModeChoiceExt ...@@ -75,6 +76,12 @@ public class SwissDiscreteModeChoiceModule extends AbstractDiscreteModeChoiceExt
return parameters; return parameters;
} }
@Singleton
@Provides
public SharedAVTravelCost provideTravelCost(CostParameters costParameters) {
return new DefaultSharedAVTravelCost(costParameters);
}
@Provides @Provides
@Singleton @Singleton
public CostModel provideCostModel(SwissUtilityParameters parameters, SharedAVTravelCost sharedCost) { public CostModel provideCostModel(SwissUtilityParameters parameters, SharedAVTravelCost sharedCost) {
......
...@@ -193,10 +193,4 @@ public class SharedAVModule extends AbstractDiscreteModeChoiceExtension { ...@@ -193,10 +193,4 @@ public class SharedAVModule extends AbstractDiscreteModeChoiceExtension {
public VehicleType provideVehicleType(Scenario scenario) { public VehicleType provideVehicleType(Scenario scenario) {
return scenario.getVehicles().getVehicleTypes().get(FlowEfficiencyConfigurator.SHARED_AV_VEHICLE_TYPE_ID); return scenario.getVehicles().getVehicleTypes().get(FlowEfficiencyConfigurator.SHARED_AV_VEHICLE_TYPE_ID);
} }
@Singleton
@Provides
public SharedAVTravelCost provideTravelCost(CostParameters costParameters) {
return new DefaultSharedAVTravelCost(costParameters);
}
} }
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