https://gitlab.ethz.ch/ivt-vpl/astra_2018_002.git

Conflicts:
	src/main/java/ch/ethz/matsim/projects/astra_2018_002/ASTRAConfigurator.java

AvFlowEfficiencyCalculator

I added the condition that in order for AV-PCUs to be used, the
attribute "avOperation" must be "true"
I added the condition that if avOperation is false, then pcu_car or
pcu_truck will be used. "sharedAv" does not have this condition,
becaused sharedAvs are not allowed on links that don't have autonomous
operation.
I added PCU values for truck
I added PCU values for truck_av
I added PCU values for sharedAv, aka the taxis, which are the same as
those for prav5

FlowEfficiencyConfigurator

added FREIGHT_TRUCK_ID
added FREIGHT_TRUCK_AV_ID
gave "truck" and "truckAv" vehicles a maximum speed of 22.22m/s which is
80km/h, since this is (apparently?) the maximum speed for these vehicles
in Switzerland
gave "truck" and "truckAv" vehicles the default capacities, which would
need to be changed if we ever did detailed freight logistics stuff with
labor costs and driving time etc.

ASTRAConfigurator

added "truck" and "truckAv" to allowedModes

Custom restrictions for AVs depending on year

See merge request !15

This reverts commit ffad0bc7.