Merge branch 'conditional-flow-eficiency' into 'master'

Make advanced flow efficiency calculator dependent on whether AVs are used

See merge request !6

src/main/java/ch/ethz/matsim/projects/astra_2018_002/RunASTRA2018002.java

@@ -42,9 +42,9 @@ public class RunASTRA2018002 {
 
 		// Adjust config (they need to stay in the correct order!)
 		SwissModeChoiceConfigurator.configure(config);
-		FlowEfficiencyConfigurator.configure(config);
 		SharedAVConfigurator.configure(config);
 		PrivateAVConfigurator.configure(config);
+		FlowEfficiencyConfigurator.configure(config);
 		cmd.applyConfiguration(config);
 
 		// Load scenario

src/main/java/ch/ethz/matsim/projects/astra_2018_002/flow_efficiency/FlowEfficiencyConfigurator.java

@@ -7,6 +7,9 @@ import org.matsim.core.config.groups.QSimConfigGroup.VehiclesSource;
 import org.matsim.vehicles.VehicleType;
 import org.matsim.vehicles.VehicleUtils;
 
+import ch.ethz.matsim.projects.astra_2018_002.private_av.PrivateAVConfigGroup;
+import ch.ethz.matsim.projects.astra_2018_002.shared_av.SharedAVConfigGroup;
+
 public class FlowEfficiencyConfigurator {
 	static final public Id<VehicleType> CONVENTIONAL_VEHICLE_TYPE_ID = Id.create("car", VehicleType.class);
 	static final public Id<VehicleType> PRIVATE_AV_VEHICLE_TYPE_ID = Id.create("private_av", VehicleType.class);
@@ -19,16 +22,21 @@ public class FlowEfficiencyConfigurator {
 		// Load vehicles by vehicle type
 		config.qsim().setVehiclesSource(VehiclesSource.modeVehicleTypesFromVehiclesData);
 
-		// TODO: Do we need those?
-		// config.travelTimeCalculator().setAnalyzedModes("car,private_av");
-		// config.travelTimeCalculator().setSeparateModes(true);
-
-		// Set the calculator instance (not the best design, but works)
+		PrivateAVConfigGroup privateConfig = (PrivateAVConfigGroup) config.getModules()
+				.get(PrivateAVConfigGroup.GROUP_NAME);
+		SharedAVConfigGroup sharedConfig = (SharedAVConfigGroup) config.getModules()
+				.get(SharedAVConfigGroup.GROUP_NAME);
 
-		// With the AvFlowEfficiencyCalculator we can distinguish between HLS
-		//and other roads in combination with vehicle types
-		FlowEfficiencyCalculator calculator = new AvFlowEfficiencyCalculator();
-		FlowEfficiencyCalculator.INSTANCE.set(calculator);
+		if (privateConfig.getUsePrivateAVs() || sharedConfig.getUseSharedAVs()) {
+			// With the AvFlowEfficiencyCalculator we can distinguish between HLS
+			// and other roads in combination with vehicle types
+			FlowEfficiencyCalculator calculator = new AvFlowEfficiencyCalculator();
+			FlowEfficiencyCalculator.INSTANCE.set(calculator);
+		} else {
+			// Set the calculator instance (not the best design, but works)
+			FlowEfficiencyCalculator calculator = new StaticFlowEfficiencyCalculator();
+			FlowEfficiencyCalculator.INSTANCE.set(calculator);
+		}
 	}
 
 	static public void defineVehicleTypes(Scenario scenario) {
@@ -43,15 +51,15 @@ public class FlowEfficiencyConfigurator {
 		VehicleType sharedAvVehicleType = VehicleUtils.getFactory() //
 				.createVehicleType(SHARED_AV_VEHICLE_TYPE_ID);
 		scenario.getVehicles().addVehicleType(sharedAvVehicleType);
-		
+
 		VehicleType prav3VehicleType = VehicleUtils.getFactory() //
 				.createVehicleType(PRAV3_ID);
 		scenario.getVehicles().addVehicleType(prav3VehicleType);
-		
+
 		VehicleType prav4VehicleType = VehicleUtils.getFactory() //
 				.createVehicleType(PRAV4_ID);
 		scenario.getVehicles().addVehicleType(prav4VehicleType);
-		
+
 		VehicleType prav5VehicleType = VehicleUtils.getFactory() //
 				.createVehicleType(PRAV5_ID);
 		scenario.getVehicles().addVehicleType(prav5VehicleType);