From 64f9dd157113bbf35273af706bc3fe0676147a8c Mon Sep 17 00:00:00 2001
From: rakow <rakow@vsp.tu-berlin.de>
Date: Thu, 6 Jun 2024 20:48:19 +0200
Subject: [PATCH] moved commercial traffic data

---
 Makefile                                      |   2 +-
 input/commercialTraffic/config_demand.xml     | 579 ------------------
 ...Data.csv => commercialTrafficAreaData.csv} |   0
 .../berlin-v6.3-vehicleTypes.xml}             |  52 +-
 4 files changed, 52 insertions(+), 581 deletions(-)
 delete mode 100644 input/commercialTraffic/config_demand.xml
 rename input/{commercialTraffic/investigationAreaData.csv => commercialTrafficAreaData.csv} (100%)
 rename input/{commercialTraffic/commercial_VehicleTypes_CV.xml => v6.3/berlin-v6.3-vehicleTypes.xml} (78%)

diff --git a/Makefile b/Makefile
index feb71b7b..d057f40c 100644
--- a/Makefile
+++ b/Makefile
@@ -196,7 +196,7 @@ $p/commercialFacilities.xml.gz:
 	 --landuseShapeFileName $(berlin)/input/shp/berlinBrandenburg_landuse_4326.shp\
 	 --shapeFileLanduseTypeColumn "fclass"\
 	 --shapeCRS "EPSG:4326"\
-	 --pathToInvestigationAreaData $p/commercialTraffic/investigationAreaData.csv
+	 --pathToInvestigationAreaData $p/commercialTrafficAreaData.csv
 
 $p/berlin-small-scale-commercialTraffic-$V-25pct.plans.xml.gz: $p/berlin-$V-network.xml.gz $p/commercialFacilities.xml.gz
 	$(sc) prepare generate-small-scale-commercial-traffic\
diff --git a/input/commercialTraffic/config_demand.xml b/input/commercialTraffic/config_demand.xml
deleted file mode 100644
index fe72019b..00000000
--- a/input/commercialTraffic/config_demand.xml
+++ /dev/null
@@ -1,579 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE config SYSTEM "http://www.matsim.org/files/dtd/config_v2.dtd">
-<config>
-	<module name="global" >
-		<param name="coordinateSystem" value="EPSG:25832" />
-		<param name="defaultDelimiter" value=";" />
-		<param name="insistingOnDeprecatedConfigVersion" value="false" />
-		<!-- "global" number of threads.  This number is used, e.g., for replanning, but NOT in QSim.  This can typically be set to as many cores as you have available, or possibly even slightly more. -->
-		<param name="numberOfThreads" value="2" />
-		<param name="randomSeed" value="4177" />
-	</module>
-	<module name="vehicles" >
-		<param name="vehiclesFile" value="commercial_VehicleTypes_CV.xml" />
-	</module>
-	<module name="freight" >
-		<!-- Freight Carriers File, according to MATSim freight contrib -->
-		<param name="carriersFile" value="null" />
-		<!-- Carrier Vehicle Types file, according to MATSim freight contrib -->
-		<param name="carriersVehicleTypeFile" value="null" />
-		<!-- time slice width used for calculation of travel times in seconds. The smaller the value, the more precise the calculation of routing costs but the longer the computation time. Default value is 1800 seconds. -->
-		<param name="travelTimeSliceWidth" value="1800" />
-		<!-- Use distance constraint within the tour planning phase. This does NOT ensure that the tours in MATSim will respect this limitation -->
-		<param name="useDistanceConstraintForTourPlanning" value="noDistanceConstraint" />
-		<!-- (Optional) Vehicle Routing Algorithm File, according to jsprit library. Empty value "" means a default algorithm is used. -->
-		<param name="vehicleRoutingAlgorithmFile" value="null" />
-	</module>
-	<module name="controler" >
-		<!-- Compression algorithm to use when writing out data to files. Possible values: [none, gzip, lz4, zst] -->
-		<param name="compressionType" value="gzip" />
-		<!-- Sets whether graphs showing some analyses should automatically be generated during the simulation. The generation of graphs usually takes a small amount of time that does not have any weight in big simulations, but add a significant overhead in smaller runs or in test cases where the graphical output is not even requested. -->
-		<param name="createGraphs" value="true" />
-		<!-- true if at the end of a run, plans, network, config etc should be dumped to a file -->
-		<param name="dumpDataAtEnd" value="true" />
-		<!-- Default=false. If enabled, the router takes travel times needed for turning moves into account. Cannot be used if the (Fast)AStarLandmarks routing or TravelTimeCalculator.separateModes is enabled. -->
-		<param name="enableLinkToLinkRouting" value="false" />
-		<!-- Default=xml; Specifies the file format for writing events. Currently supported: [xml, pb, json]
-		Multiple values can be specified separated by commas (','). -->
-		<param name="eventsFileFormat" value="xml" />
-		<!-- Default=0. First Iteration of a simulation. -->
-		<param name="firstIteration" value="0" />
-		<!-- Default=1000. Last Iteration of a simulation. -->
-		<param name="lastIteration" value="0" />
-		<!-- Defines which mobility simulation will be used. Currently supported: qsim JDEQSim hermes
-		Depending on the chosen mobsim, you'll have to add additional config modules to configure the corresponding mobsim.
-		For 'qsim', add a module 'qsim' to the config. -->
-		<param name="mobsim" value="qsim" />
-		<param name="outputDirectory" value="output/SmallScaleCommercialTraffic/" />
-		<!-- Possible values: failIfDirectoryExists, overwriteExistingFiles, deleteDirectoryIfExists -->
-		<param name="overwriteFiles" value="overwriteExistingFiles" />
-		<!-- The type of routing (least cost path) algorithm used, may have the values: [Dijkstra, AStarLandmarks, FastDijkstra, FastAStarLandmarks, SpeedyALT] -->
-		<param name="routingAlgorithmType" value="SpeedyALT" />
-		<!-- An identifier for the current run which is used as prefix for output files and mentioned in output xml files etc. -->
-		<param name="runId" value="null" />
-		<!-- Comma-separated list of visualizer output file formats. `transims', `googleearth', and `otfvis'. -->
-		<param name="snapshotFormat" value="" />
-		<!-- iterationNumber % writeEventsInterval == 0 defines in which iterations events are written to a file. `0' disables events writing completely. -->
-		<param name="writeEventsInterval" value="50" />
-		<!-- iterationNumber % writePlansInterval == 0 defines (hopefully) in which iterations plans are written to a file. `0' disables plans writing completely.  Some plans in early iterations are always written -->
-		<param name="writePlansInterval" value="50" />
-		<!-- iterationNumber % writeSnapshotsInterval == 0 defines in which iterations snapshots are written to a file. `0' disables snapshots writing completely -->
-		<param name="writeSnapshotsInterval" value="1" />
-		<!-- iterationNumber % writeEventsInterval == 0 defines in which iterations trips CSV are written to a file. `0' disables trips writing completely. -->
-		<param name="writeTripsInterval" value="50" />
-	</module>
-	<module name="network" >
-		<!-- The Coordinates Reference System in which the coordinates are expressed in the input file. At import, the coordinates will be converted to the coordinate system defined in "global", and willbe converted back at export. If not specified, no conversion happens. -->
-		<param name="inputCRS" value="EPSG:25832" />
-		<param name="inputChangeEventsFile" value="null" />
-		<param name="inputNetworkFile" value="../v6.1/berlin-v6.1-network.xml.gz" />
-		<param name="laneDefinitionsFile" value="null" />
-		<param name="timeVariantNetwork" value="false" />
-	</module>
-	<module name="JDEQSim" >
-		<param name="carSize" value="7.5" />
-		<param name="endTime" value="undefined" />
-		<param name="flowCapacityFactor" value="1.0" />
-		<param name="gapTravelSpeed" value="15.0" />
-		<param name="minimumInFlowCapacity" value="1800.0" />
-		<param name="squeezeTime" value="1800.0" />
-		<param name="storageCapacityFactor" value="1.0" />
-	</module>
-	<module name="ReplanningAnnealer" >
-		<!-- Activate the scaling of replanning modules using an annealing approach rather than fixed rates. -->
-		<param name="activateAnnealingModule" value="false" />
-	</module>
-	<module name="TimeAllocationMutator" >
-		<!-- Default:true; Defines whether time mutation changes an activity's duration. -->
-		<param name="mutationAffectsDuration" value="true" />
-		<!-- Default:1800.0; Defines how many seconds a time mutation can maximally shift a time. -->
-		<param name="mutationRange" value="1800.0" />
-	</module>
-	<module name="changeMode" >
-		<!-- Defines whether car availability is considered be considered or not. An agent has no car only if it has no license, or never access to a car. Default: true -->
-		<param name="ignoreCarAvailability" value="true" />
-		<!-- Defines the mode switch behavior. Possible values [fromAllModesToSpecifiedModes, fromSpecifiedModesToSpecifiedModes] Default: fromSpecifiedModesToSpecifiedModes. -->
-		<param name="modeSwitchBehavior" value="fromSpecifiedModesToSpecifiedModes" />
-		<!-- Defines all the modes available, including chain-based modes, seperated by commas -->
-		<param name="modes" value="car,pt" />
-	</module>
-	<module name="counts" >
-		<!-- Transport modes that will be respected for the counts comparison. 'car' is default, which includes also bussed from the pt simulation module. Use this parameter in combination with 'filterModes' = true! -->
-		<param name="analyzedModes" value="car" />
-		<!-- Specifies over how many iterations the link volumes should be averaged that are used for the counts comparison. Use 1 or 0 to only use the link volumes of a single iteration. This values cannot be larger than the value specified for writeCountsInterval -->
-		<param name="averageCountsOverIterations" value="5" />
-		<!-- factor by which to re-scale the simulated values.  necessary when simulation runs with something different from 100%.  needs to be adapted manually -->
-		<param name="countsScaleFactor" value="1.0" />
-		<!-- distance to distanceFilterCenterNode to include counting stations. The unit of distance is the Euclidean distance implied by the coordinate system -->
-		<param name="distanceFilter" value="null" />
-		<!-- node id for center node of distance filter -->
-		<param name="distanceFilterCenterNode" value="null" />
-		<!-- If true, link counts from legs performed on modes not included in the 'analyzedModes' parameter are ignored. -->
-		<param name="filterModes" value="false" />
-		<!-- The Coordinates Reference System in which the coordinates are expressed in the input file. At import, the coordinates will be converted to the coordinate system defined in "global", and willbe converted back at export. If not specified, no conversion happens. -->
-		<param name="inputCRS" value="null" />
-		<!-- input file name to counts package -->
-		<param name="inputCountsFile" value="null" />
-		<!-- possible values: `html', `kml', `txt', `all' -->
-		<param name="outputformat" value="txt" />
-		<!-- Specifies how often the counts comparison should be calculated and written. -->
-		<param name="writeCountsInterval" value="10" />
-	</module>
-	<module name="facilities" >
-		<!-- This defines how facilities should be created. Possible values: none fromFile setInScenario onePerActivityLinkInPlansFile onePerActivityLinkInPlansFileExceptWhenCoordinatesAreGiven onePerActivityLocationInPlansFile  -->
-		<param name="facilitiesSource" value="none" />
-		<!-- A prefix to be used for auto-generated IDs. -->
-		<param name="idPrefix" value="f_auto_" />
-		<!-- The Coordinates Reference System in which the coordinates are expressed in the input file. At import, the coordinates will be converted to the coordinate system defined in "global", and willbe converted back at export. If not specified, no conversion happens. -->
-		<param name="inputCRS" value="null" />
-		<param name="inputFacilitiesFile" value="null" />
-		<param name="inputFacilityAttributesFile" value="null" />
-		<param name="insistingOnUsingDeprecatedFacilitiesAttributeFile" value="false" />
-	</module>
-	<module name="hermes" >
-		<!-- Simulation End Time -->
-		<param name="endTime" value="30:00:00" />
-		<param name="flowCapacityFactor" value="1.0" />
-		<param name="mainMode" value="car" />
-		<param name="storageCapacityFactor" value="1.0" />
-		<!-- time in seconds.  Time after which the frontmost vehicle on a link is called `stuck' if it does not move. Set to Integer.MAX_VALUE to disable this behavior -->
-		<param name="stuckTime" value="10" />
-		<!-- treats PT as deterministic. PT vehicles will run with a steady speed. Should be used with separate network layers for PT and other network modes. -->
-		<param name="useDeterministicPt" value="false" />
-	</module>
-	<module name="households" >
-		<param name="inputFile" value="null" />
-		<param name="inputHouseholdAttributesFile" value="null" />
-		<param name="insistingOnUsingDeprecatedHouseholdsAttributeFile" value="false" />
-	</module>
-	<module name="linkStats" >
-		<!-- Specifies over how many iterations the link volumes should be averaged that are used for the link statistics. Use 1 or 0 to only use the link volumes of a single iteration. This values cannot be larger than the value specified for writeLinkStatsInterval -->
-		<param name="averageLinkStatsOverIterations" value="5" />
-		<!-- Specifies how often the link stats should be calculated and written. Use 0 to disable the generation of link stats. -->
-		<param name="writeLinkStatsInterval" value="50" />
-	</module>
-	<module name="parallelEventHandling" >
-		<!-- Estimated number of events during mobsim run. An optional optimization hint for the framework. -->
-		<param name="estimatedNumberOfEvents" value="null" />
-		<!-- Size of the events Queue. Increase for very large scenarios -->
-		<param name="eventsQueueSize" value="131072" />
-		<!-- Number of threads for parallel events handler. _null_ means the framework decides by itself. 0 is currently not possible. -->
-		<param name="numberOfThreads" value="null" />
-		<!-- If enabled, each event handler is assigned to its own thread. Note that enabling this feature disabled the numberOfThreads option! This feature is still experimental! -->
-		<param name="oneThreadPerHandler" value="false" />
-		<!-- If enabled, it is ensured that all events that are created during a time step of the mobility simulation are processed before the next time step is simulated. E.g. neccessary when within-day replanning is used. -->
-		<param name="synchronizeOnSimSteps" value="true" />
-	</module>
-	<module name="planCalcScore" >
-		<!-- logit model scale parameter. default: 1.  Has name and default value for historical reasons (see Bryan Raney's phd thesis). -->
-		<param name="BrainExpBeta" value="1.0" />
-		<param name="PathSizeLogitBeta" value="1.0" />
-		<!-- fraction of iterations at which MSA score averaging is started. The matsim theory department suggests to use this together with switching off choice set innovation (where a similar switch exists), but it has not been tested yet. -->
-		<param name="fractionOfIterationsToStartScoreMSA" value="0.8" />
-		<!-- new_score = (1-learningRate)*old_score + learningRate * score_from_mobsim.  learning rates close to zero emulate score averaging, but slow down initial convergence -->
-		<param name="learningRate" value="1.0" />
-		<!-- There used to be a plateau between duration=0 and duration=zeroUtilityDuration. This caused durations to evolve to zero once they were below zeroUtilityDuration, causing problems.  Only use this switch if you need to be backwards compatible with some old results.  (changed nov'13) -->
-		<param name="usingOldScoringBelowZeroUtilityDuration" value="false" />
-		<!-- write a plans file in each iteration directory which contains what each agent actually did, and the score it received. -->
-		<param name="writeExperiencedPlans" value="false" />
-		<parameterset type="scoringParameters" >
-			<param name="earlyDeparture" value="-0.0" />
-			<param name="lateArrival" value="-18.0" />
-			<param name="marginalUtilityOfMoney" value="1.0" />
-			<param name="performing" value="6.0" />
-			<param name="subpopulation" value="null" />
-			<param name="utilityOfLineSwitch" value="-1.0" />
-			<param name="waiting" value="-0.0" />
-			<param name="waitingPt" value="-6.0" />
-			<parameterset type="activityParams" >
-				<param name="activityType" value="dummy" />
-				<param name="closingTime" value="undefined" />
-				<param name="earliestEndTime" value="undefined" />
-				<param name="latestStartTime" value="undefined" />
-				<param name="minimalDuration" value="undefined" />
-				<param name="openingTime" value="undefined" />
-				<param name="priority" value="1.0" />
-				<param name="scoringThisActivityAtAll" value="true" />
-				<!-- typical duration of activity.  needs to be defined and non-zero.  in sec. -->
-				<param name="typicalDuration" value="02:00:00" />
-				<!-- method to compute score at typical duration.  Options: | uniform | relative | Use uniform for backwards compatibility (all activities same score; higher proba to drop long acts). -->
-				<param name="typicalDurationScoreComputation" value="relative" />
-			</parameterset>
-			<parameterset type="activityParams" >
-				<param name="activityType" value="car interaction" />
-				<param name="closingTime" value="undefined" />
-				<param name="earliestEndTime" value="undefined" />
-				<param name="latestStartTime" value="undefined" />
-				<param name="minimalDuration" value="undefined" />
-				<param name="openingTime" value="undefined" />
-				<param name="priority" value="1.0" />
-				<param name="scoringThisActivityAtAll" value="false" />
-				<param name="typicalDuration" value="undefined" />
-				<param name="typicalDurationScoreComputation" value="relative" />
-			</parameterset>
-			<parameterset type="activityParams" >
-				<param name="activityType" value="pt interaction" />
-				<param name="closingTime" value="undefined" />
-				<param name="earliestEndTime" value="undefined" />
-				<param name="latestStartTime" value="undefined" />
-				<param name="minimalDuration" value="undefined" />
-				<param name="openingTime" value="undefined" />
-				<param name="priority" value="1.0" />
-				<param name="scoringThisActivityAtAll" value="false" />
-				<param name="typicalDuration" value="undefined" />
-				<param name="typicalDurationScoreComputation" value="relative" />
-			</parameterset>
-			<parameterset type="activityParams" >
-				<param name="activityType" value="bike interaction" />
-				<param name="closingTime" value="undefined" />
-				<param name="earliestEndTime" value="undefined" />
-				<param name="latestStartTime" value="undefined" />
-				<param name="minimalDuration" value="undefined" />
-				<param name="openingTime" value="undefined" />
-				<param name="priority" value="1.0" />
-				<param name="scoringThisActivityAtAll" value="false" />
-				<param name="typicalDuration" value="undefined" />
-				<param name="typicalDurationScoreComputation" value="relative" />
-			</parameterset>
-			<parameterset type="activityParams" >
-				<param name="activityType" value="drt interaction" />
-				<param name="closingTime" value="undefined" />
-				<param name="earliestEndTime" value="undefined" />
-				<param name="latestStartTime" value="undefined" />
-				<param name="minimalDuration" value="undefined" />
-				<param name="openingTime" value="undefined" />
-				<param name="priority" value="1.0" />
-				<param name="scoringThisActivityAtAll" value="false" />
-				<param name="typicalDuration" value="undefined" />
-				<param name="typicalDurationScoreComputation" value="relative" />
-			</parameterset>
-			<parameterset type="activityParams" >
-				<param name="activityType" value="taxi interaction" />
-				<param name="closingTime" value="undefined" />
-				<param name="earliestEndTime" value="undefined" />
-				<param name="latestStartTime" value="undefined" />
-				<param name="minimalDuration" value="undefined" />
-				<param name="openingTime" value="undefined" />
-				<param name="priority" value="1.0" />
-				<param name="scoringThisActivityAtAll" value="false" />
-				<param name="typicalDuration" value="undefined" />
-				<param name="typicalDurationScoreComputation" value="relative" />
-			</parameterset>
-			<parameterset type="activityParams" >
-				<param name="activityType" value="other interaction" />
-				<param name="closingTime" value="undefined" />
-				<param name="earliestEndTime" value="undefined" />
-				<param name="latestStartTime" value="undefined" />
-				<param name="minimalDuration" value="undefined" />
-				<param name="openingTime" value="undefined" />
-				<param name="priority" value="1.0" />
-				<param name="scoringThisActivityAtAll" value="false" />
-				<param name="typicalDuration" value="undefined" />
-				<param name="typicalDurationScoreComputation" value="relative" />
-			</parameterset>
-			<parameterset type="activityParams" >
-				<param name="activityType" value="walk interaction" />
-				<param name="closingTime" value="undefined" />
-				<param name="earliestEndTime" value="undefined" />
-				<param name="latestStartTime" value="undefined" />
-				<param name="minimalDuration" value="undefined" />
-				<param name="openingTime" value="undefined" />
-				<param name="priority" value="1.0" />
-				<param name="scoringThisActivityAtAll" value="false" />
-				<param name="typicalDuration" value="undefined" />
-				<param name="typicalDurationScoreComputation" value="relative" />
-			</parameterset>
-			<parameterset type="activityParams" >
-				<param name="activityType" value="ride interaction" />
-				<param name="closingTime" value="undefined" />
-				<param name="earliestEndTime" value="undefined" />
-				<param name="latestStartTime" value="undefined" />
-				<param name="minimalDuration" value="undefined" />
-				<param name="openingTime" value="undefined" />
-				<param name="priority" value="1.0" />
-				<param name="scoringThisActivityAtAll" value="false" />
-				<param name="typicalDuration" value="undefined" />
-				<param name="typicalDurationScoreComputation" value="relative" />
-			</parameterset>
-			<parameterset type="modeParams" >
-				<!-- [utils] alternative-specific constant.  Normally per trip, but that is probably buggy for multi-leg trips. -->
-				<param name="constant" value="0.0" />
-				<!-- [unit_of_money/day] Fixed cost of mode, per day. -->
-				<param name="dailyMonetaryConstant" value="0.0" />
-				<!-- [utils] daily utility constant. default=0 to be backwards compatible -->
-				<param name="dailyUtilityConstant" value="0.0" />
-				<!-- [utils/m] utility of traveling (e.g. walking or driving) per m, normally negative.  this is on top of the time (dis)utility. -->
-				<param name="marginalUtilityOfDistance_util_m" value="0.0" />
-				<!-- [utils/hr] additional marginal utility of traveling.  normally negative.  this comes on top of the opportunity cost of time -->
-				<param name="marginalUtilityOfTraveling_util_hr" value="-6.0" />
-				<param name="mode" value="car" />
-				<!-- [unit_of_money/m] conversion of distance into money. Normally negative. -->
-				<param name="monetaryDistanceRate" value="0.0" />
-			</parameterset>
-			<parameterset type="modeParams" >
-				<param name="constant" value="0.0" />
-				<param name="dailyMonetaryConstant" value="0.0" />
-				<param name="dailyUtilityConstant" value="0.0" />
-				<param name="marginalUtilityOfDistance_util_m" value="0.0" />
-				<param name="marginalUtilityOfTraveling_util_hr" value="-6.0" />
-				<param name="mode" value="pt" />
-				<param name="monetaryDistanceRate" value="0.0" />
-			</parameterset>
-			<parameterset type="modeParams" >
-				<param name="constant" value="0.0" />
-				<param name="dailyMonetaryConstant" value="0.0" />
-				<param name="dailyUtilityConstant" value="0.0" />
-				<param name="marginalUtilityOfDistance_util_m" value="0.0" />
-				<param name="marginalUtilityOfTraveling_util_hr" value="-6.0" />
-				<param name="mode" value="walk" />
-				<param name="monetaryDistanceRate" value="0.0" />
-			</parameterset>
-			<parameterset type="modeParams" >
-				<param name="constant" value="0.0" />
-				<param name="dailyMonetaryConstant" value="0.0" />
-				<param name="dailyUtilityConstant" value="0.0" />
-				<param name="marginalUtilityOfDistance_util_m" value="0.0" />
-				<param name="marginalUtilityOfTraveling_util_hr" value="-6.0" />
-				<param name="mode" value="bike" />
-				<param name="monetaryDistanceRate" value="0.0" />
-			</parameterset>
-			<parameterset type="modeParams" >
-				<param name="constant" value="0.0" />
-				<param name="dailyMonetaryConstant" value="0.0" />
-				<param name="dailyUtilityConstant" value="0.0" />
-				<param name="marginalUtilityOfDistance_util_m" value="0.0" />
-				<param name="marginalUtilityOfTraveling_util_hr" value="-6.0" />
-				<param name="mode" value="ride" />
-				<param name="monetaryDistanceRate" value="0.0" />
-			</parameterset>
-			<parameterset type="modeParams" >
-				<param name="constant" value="0.0" />
-				<param name="dailyMonetaryConstant" value="0.0" />
-				<param name="dailyUtilityConstant" value="0.0" />
-				<param name="marginalUtilityOfDistance_util_m" value="0.0" />
-				<param name="marginalUtilityOfTraveling_util_hr" value="-6.0" />
-				<param name="mode" value="other" />
-				<param name="monetaryDistanceRate" value="0.0" />
-			</parameterset>
-		</parameterset>
-	</module>
-	<module name="plans" >
-		<!-- String: minOfDurationAndEndTime tryEndTimeThenDuration endTimeOnly. Anything besides minOfDurationAndEndTime will internally use a different (simpler) version of the TimeAllocationMutator. -->
-		<param name="activityDurationInterpretation" value="tryEndTimeThenDuration" />
-		<!-- Possible values: reject, useMainModeIdentifier -->
-		<param name="handlingOfPlansWithoutRoutingMode" value="reject" />
-		<!-- The Coordinates Reference System in which the coordinates are expressed in the input file. At import, the coordinates will be converted to the coordinate system defined in "global", and willbe converted back at export. If not specified, no conversion happens. -->
-		<param name="inputCRS" value="null" />
-		<param name="inputPersonAttributesFile" value="null" />
-		<param name="inputPlansFile" value="null" />
-		<param name="insistingOnUsingDeprecatedPersonAttributeFile" value="false" />
-		<!-- Defines how routes are stored in memory. Currently supported: LinkNetworkRoute, CompressedNetworkRoute. -->
-		<param name="networkRouteType" value="LinkNetworkRoute" />
-		<!-- (not tested) will remove plan attributes that are presumably not used, such as activityStartTime. default=false. Use with Caution! -->
-		<param name="removingUnnecessaryPlanAttributes" value="true" />
-		<!-- Defines how departure times are interpreted in rerouting applications. If set to 'ignoreDelays', the departure time of a trip when routing along a plan will always be the nominal (plan-based) activity end time. If set to 'shiftActivityEndTimes', routing along a plan will accumulate travel times and shift activity end times if necessary -->
-		<param name="tripDurationHandling" value="ignoreDelays" />
-	</module>
-	<module name="planscalcroute" >
-		<!-- Defines how access and egress to main mode is simulated. Either of [none, accessEgressModeToLink, walkConstantTimeToLink, accessEgressModeToLinkPlusTimeConstant], Current default=none which means no access or egress trips are simulated. -->
-		<param name="accessEgressType" value="none" />
-		<!-- Some typical teleportation routing params are set by default, such as for walk and bike.  Setting this switch to "true" will clear them.  Note that this will also clear settings for helper modes such as for non_network_walk -->
-		<param name="clearDefaultTeleportedModeParams" value="false" />
-		<!-- All the modes for which the router is supposed to generate network routes (like car) -->
-		<param name="networkModes" value="car" />
-		<!-- strength of the randomness for the utility of money in routing under toll.  Leads to Pareto-optimal route with randomly drawn money-vs-other-attributes tradeoff. Technically the width parameter of a log-normal distribution. 3.0 seems to be a good value.  -->
-		<param name="routingRandomness" value="3.0" />
-		<parameterset type="teleportedModeParameters" >
-			<param name="beelineDistanceFactor" value="1.3" />
-			<param name="mode" value="bike" />
-			<!-- Free-speed factor for a teleported mode. Travel time = teleportedModeFreespeedFactor * <freespeed car travel time>. Insert a line like this for every such mode. Please do not set teleportedModeFreespeedFactor as well as teleportedModeSpeed for the same mode, but if you do, +teleportedModeFreespeedFactor wins over teleportedModeSpeed. -->
-			<param name="teleportedModeFreespeedFactor" value="null" />
-			<!-- Speed for a teleported mode. Travel time = (<beeline distance> * beelineDistanceFactor) / teleportedModeSpeed. Insert a line like this for every such mode. -->
-			<param name="teleportedModeSpeed" value="4.166666666666667" />
-		</parameterset>
-		<parameterset type="teleportedModeParameters" >
-			<param name="beelineDistanceFactor" value="1.3" />
-			<param name="mode" value="walk" />
-			<param name="teleportedModeFreespeedFactor" value="null" />
-			<param name="teleportedModeSpeed" value="0.8333333333333333" />
-		</parameterset>
-		<parameterset type="teleportedModeParameters" >
-			<param name="beelineDistanceFactor" value="1.3" />
-			<param name="mode" value="non_network_walk" />
-			<param name="teleportedModeFreespeedFactor" value="null" />
-			<param name="teleportedModeSpeed" value="0.8333333333333333" />
-		</parameterset>
-		<parameterset type="teleportedModeParameters" >
-			<param name="beelineDistanceFactor" value="1.3" />
-			<param name="mode" value="ride" />
-			<param name="teleportedModeFreespeedFactor" value="1.0" />
-			<param name="teleportedModeSpeed" value="null" />
-		</parameterset>
-		<parameterset type="teleportedModeParameters" >
-			<param name="beelineDistanceFactor" value="1.3" />
-			<param name="mode" value="pt" />
-			<param name="teleportedModeFreespeedFactor" value="2.0" />
-			<param name="teleportedModeSpeed" value="null" />
-		</parameterset>
-	</module>
-	<module name="ptCounts" >
-		<!-- factor by which to re-scale the simulated values.  necessary when simulation runs with something different from 100%.  needs to be adapted manually -->
-		<param name="countsScaleFactor" value="1.0" />
-		<!-- distance to distanceFilterCenterNode to include counting stations. The unit of distance is the Euclidean distance implied by the coordinate system -->
-		<param name="distanceFilter" value="null" />
-		<!-- node id for center node of distance filter -->
-		<param name="distanceFilterCenterNode" value="null" />
-		<!-- input file containing the alighting (getting off) counts for pt -->
-		<param name="inputAlightCountsFile" value="null" />
-		<!-- input file containing the boarding (getting on) counts for pt -->
-		<param name="inputBoardCountsFile" value="null" />
-		<!-- input file containing the occupancy counts for pt -->
-		<param name="inputOccupancyCountsFile" value="null" />
-		<!-- possible values: `html', `kml', `txt', `all' -->
-		<param name="outputformat" value="null" />
-		<!-- every how many iterations (starting with 0) counts comparisons are generated -->
-		<param name="ptCountsInterval" value="10" />
-	</module>
-	<module name="qsim" >
-		<param name="endTime" value="undefined" />
-		<!-- If set to withLinkAttributes snapshots will only be generated for links which include generateSnapshotForLink as attribute key. Default is no filtering. -->
-		<param name="filterSnapshots" value="no" />
-		<param name="flowCapacityFactor" value="1.0" />
-		<!-- decides if waiting vehicles enter the network after or before the already driving vehicles were moved. Default: false -->
-		<param name="insertingWaitingVehiclesBeforeDrivingVehicles" value="true" />
-		<!-- If link dynamics is set as SeepageQ, set to false if all seep modes should perform seepage. Default is true (better option). -->
-		<param name="isRestrictingSeepage" value="true" />
-		<!-- If link dynamics is set as SeepageQ, set to true if seep mode do not consumes any space on the link. Default is false. -->
-		<param name="isSeepModeStorageFree" value="false" />
-		<!-- default: FIFO; options: FIFO PassingQ SeepageQ -->
-		<param name="linkDynamics" value="FIFO" />
-		<!-- The (initial) width of the links of the network. Use positive floating point values. This is used only for visualisation. -->
-		<param name="linkWidth" value="30.0" />
-		<!-- [comma-separated list] Defines which modes are congested modes. Technically, these are the modes that the departure handler of the netsimengine handles.  Effective cell size, effective lane width, flow capacity factor, and storage capacity factor need to be set with diligence.  Need to be vehicular modes to make sense. -->
-		<param name="mainMode" value="car" />
-		<!-- Shortens a link in the visualization, i.e. its start and end point are moved into towards the center. Does not affect traffic flow.  -->
-		<param name="nodeOffset" value="0.0" />
-		<!-- Number of threads used for the QSim.  Note that this setting is independent from the "global" threads setting.  In contrast to earlier versions, the non-parallel special version is no longer there. -->
-		<param name="numberOfThreads" value="1" />
-		<!-- Boolean. `true': stuck vehicles are removed, aborting the plan; `false': stuck vehicles are forced into the next link. `false' is probably the better choice. -->
-		<param name="removeStuckVehicles" value="false" />
-		<!-- If link dynamics is set as SeepageQ, set a seep mode. Default is bike. -->
-		<param name="seepMode" value="bike" />
-		<!-- Possible values: minOfEndtimeAndMobsimFinished, onlyUseEndtime -->
-		<param name="simEndtimeInterpretation" value="null" />
-		<!-- Options: maxOfStarttimeAndEarliestActivityEnd onlyUseStarttime  -->
-		<param name="simStarttimeInterpretation" value="maxOfStarttimeAndEarliestActivityEnd" />
-		<!-- snapshotStyle. One of: equiDist queue withHoles withHolesAndShowHoles kinematicWaves  -->
-		<param name="snapshotStyle" value="equiDist" />
-		<param name="snapshotperiod" value="00:00:00" />
-		<param name="startTime" value="undefined" />
-		<param name="storageCapacityFactor" value="1.0" />
-		<!-- time in seconds.  Time after which the frontmost vehicle on a link is called `stuck' if it does not move. -->
-		<param name="stuckTime" value="10.0" />
-		<param name="timeStepSize" value="00:00:01" />
-		<!-- options: queue withHoles kinematicWaves  -->
-		<param name="trafficDynamics" value="kinematicWaves" />
-		<!-- Set this parameter to true if lanes should be used, false if not. -->
-		<param name="useLanes" value="false" />
-		<!-- If a route does not reference a vehicle, agents will use the vehicle with the same id as their own. -->
-		<param name="usePersonIdForMissingVehicleId" value="true" />
-		<!-- If false, the qsim accumulates fractional flows up to one flow unit in every time step.  If true, flows are updated only if an agent wants to enter the link or an agent is added to buffer. Default is true. -->
-		<param name="usingFastCapacityUpdate" value="true" />
-		<!-- Defines what happens if an agent wants to depart, but the specified vehicle is not available. One of: teleport wait exception  -->
-		<param name="vehicleBehavior" value="teleport" />
-		<!-- If vehicles should all be the same default vehicle, or come from the vehicles file, or something else.  Possible values:  defaultVehicle modeVehicleTypesFromVehiclesData fromVehiclesData -->
-		<param name="vehiclesSource" value="fromVehiclesData" />
-	</module>
-	<module name="strategy" >
-		<!-- the external executable will be called with a config file as argument.  This is the pathname to a possible skeleton config, to which additional information will be added.  Can be null. -->
-		<param name="ExternalExeConfigTemplate" value="null" />
-		<!-- time out value (in seconds) after which matsim will consider the external strategy as failed -->
-		<param name="ExternalExeTimeOut" value="3600" />
-		<!-- root directory for temporary files generated by the external executable. Provided as a service; I don't think this is used by MATSim. -->
-		<param name="ExternalExeTmpFileRootDir" value="null" />
-		<!-- fraction of iterations where innovative strategies are switched off.  Something like 0.8 should be good.  E.g. if you run from iteration 400 to iteration 500, innovation is switched off at iteration 480 -->
-		<param name="fractionOfIterationsToDisableInnovation" value="0.8" />
-		<!-- maximum number of plans per agent.  ``0'' means ``infinity''.  Currently (2010), ``5'' is a good number -->
-		<param name="maxAgentPlanMemorySize" value="5" />
-		<!-- strategyName of PlanSelector for plans removal.  Possible defaults: WorstPlanSelector SelectRandom SelectExpBetaForRemoval ChangeExpBetaForRemoval PathSizeLogitSelectorForRemoval . The current default, WorstPlanSelector is not a good choice from a discrete choice theoretical perspective. Alternatives, however, have not been systematically tested. kai, feb'12 -->
-		<param name="planSelectorForRemoval" value="WorstPlanSelector" />
-		<parameterset type="strategysettings" >
-			<param name="strategyName" value="ChangeExpBeta" />
-			<param name="subpopulation" value="businessTraffic_withMC" />
-			<param name="weight" value="1.0" />
-		</parameterset>
-	</module>
-	<module name="subtourModeChoice" >
-		<!-- Only for backwards compatibility.  Defines if only trips from modes list should change mode, or all trips.  Options: fromAllModesToSpecifiedModes fromSpecifiedModesToSpecifiedModes  -->
-		<param name="behavior" value="fromSpecifiedModesToSpecifiedModes" />
-		<!-- Defines the chain-based modes, seperated by commas -->
-		<param name="chainBasedModes" value="car,bike" />
-		<!-- Defines whether car availability must be considered or not. A agent has no car only if it has no license, or never access to a car -->
-		<param name="considerCarAvailability" value="false" />
-		<!-- Defines all the modes available, including chain-based modes, seperated by commas -->
-		<param name="modes" value="car,pt,bike,walk" />
-	</module>
-	<module name="transit" >
-		<!-- The Coordinates Reference System in which the coordinates are expressed in the input file. At import, the coordinates will be converted to the coordinate system defined in "global", and willbe converted back at export. If not specified, no conversion happens. -->
-		<param name="inputScheduleCRS" value="null" />
-		<param name="insistingOnUsingDeprecatedAttributeFiles" value="false" />
-		<!-- The type of transit routing algorithm used, may have the values: [DijkstraBased, SwissRailRaptor] -->
-		<param name="routingAlgorithmType" value="SwissRailRaptor" />
-		<!-- Optional input file containing additional attributes for transit lines, stored as ObjectAttributes. -->
-		<param name="transitLinesAttributesFile" value="null" />
-		<!-- Comma-separated list of transportation modes that are handled as transit. Defaults to 'pt'. -->
-		<param name="transitModes" value="pt" />
-		<!-- Input file containing the transit schedule to be simulated. -->
-		<param name="transitScheduleFile" value="null" />
-		<!-- Optional input file containing additional attributes for transit stop facilities, stored as ObjectAttributes. -->
-		<param name="transitStopsAttributesFile" value="null" />
-		<!-- Set this parameter to true if transit should be simulated, false if not. -->
-		<param name="useTransit" value="false" />
-		<param name="usingTransitInMobsim" value="true" />
-		<!-- Input file containing the vehicles used by the departures in the transit schedule. -->
-		<param name="vehiclesFile" value="null" />
-	</module>
-	<module name="transitRouter" >
-		<!-- additional time the router allocates when a line switch happens. Can be interpreted as a 'safety' time that agents need to safely transfer from one line to another -->
-		<param name="additionalTransferTime" value="0.0" />
-		<!-- Factor with which direct walk generalized cost is multiplied before it is compared to the pt generalized cost.  Set to a very high value to reduce direct walk results. -->
-		<param name="directWalkFactor" value="1.0" />
-		<!-- step size to increase searchRadius if no stops are found -->
-		<param name="extensionRadius" value="200.0" />
-		<!-- maximum beeline distance between stops that agents could transfer to by walking -->
-		<param name="maxBeelineWalkConnectionDistance" value="100.0" />
-		<!-- the radius in which stop locations are searched, given a start or target coordinate -->
-		<param name="searchRadius" value="1000.0" />
-	</module>
-	<module name="travelTimeCalculator" >
-		<!-- (only for backwards compatibility; only used if separateModes==false && + filterModes==true)  Transport modes that will be respected by the travel time collector. 'car' is default which includes also buses from the pt simulation module. -->
-		<param name="analyzedModes" value="car" />
-		<param name="calculateLinkToLinkTravelTimes" value="false" />
-		<param name="calculateLinkTravelTimes" value="true" />
-		<!-- (only for backwards compatiblity; only used if separateModes==false)  Only modes included in analyzedModes are included. -->
-		<param name="filterModes" value="false" />
-		<!-- The lenght (in sec) of the time period that is splited into time bins; an additional time bin is created to aggregate all travel times collected after maxTime -->
-		<param name="maxTime" value="108000" />
-		<!-- (only for backwards compatibility) If false, link travel times are measured and aggregated over all vehicles using the link. -->
-		<param name="separateModes" value="true" />
-		<!-- How to deal with congested time bins that have no link entry events. `optimistic' assumes free speed (too optimistic); 'experimental_LastMile' is experimental and probably too pessimistic. -->
-		<param name="travelTimeAggregator" value="optimistic" />
-		<!-- The size of the time bin (in sec) into which the link travel times are aggregated for the router -->
-		<param name="travelTimeBinSize" value="900" />
-		<!-- How to deal with link entry times at different positions during the time bin. Currently supported: average, linearinterpolation -->
-		<param name="travelTimeGetter" value="average" />
-	</module>
-	<module name="vspExperimental" >
-		<!-- (do not use except of you have to) There was a problem with pt interaction scoring.  Some people solved it by overwriting the parameters of the pt interaction activity type.  Doing this now throws an Exception.  If you still insist on doing this, set the following to true. -->
-		<param name="isAbleToOverwritePtInteractionParams" value="false" />
-		<param name="isGeneratingBoardingDeniedEvent" value="false" />
-		<!-- if an approximation of the opportunity cost of time is included into the radius calculation for location choice.`true' will be faster, but it is an approximation.  Default is `true'; `false' is available for backwards compatibility. -->
-		<param name="isUsingOpportunityCostOfTimeForLocationChoice" value="true" />
-		<param name="logitScaleParamForPlansRemoval" value="1.0" />
-		<!-- Options: | ignore | info | warn | abort | .  When violating VSP defaults, this results in nothing, logfile infos, logfile warnings, or aborts.  Members of VSP should use `abort' or talk to kai. -->
-		<param name="vspDefaultsCheckingLevel" value="warn" />
-		<!-- if true then writes output_events in output directory.  default is `false'. Will only work when lastIteration is multiple of events writing interval -->
-		<param name="writingOutputEvents" value="true" />
-	</module>
-
-</config>
diff --git a/input/commercialTraffic/investigationAreaData.csv b/input/commercialTrafficAreaData.csv
similarity index 100%
rename from input/commercialTraffic/investigationAreaData.csv
rename to input/commercialTrafficAreaData.csv
diff --git a/input/commercialTraffic/commercial_VehicleTypes_CV.xml b/input/v6.3/berlin-v6.3-vehicleTypes.xml
similarity index 78%
rename from input/commercialTraffic/commercial_VehicleTypes_CV.xml
rename to input/v6.3/berlin-v6.3-vehicleTypes.xml
index 303da352..84ef8b72 100644
--- a/input/commercialTraffic/commercial_VehicleTypes_CV.xml
+++ b/input/v6.3/berlin-v6.3-vehicleTypes.xml
@@ -2,6 +2,56 @@
 
 <vehicleDefinitions xmlns="http://www.matsim.org/files/dtd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.matsim.org/files/dtd http://www.matsim.org/files/dtd/vehicleDefinitions_v2.0.xsd">
 
+	<!-- Mode types -->
+
+	<vehicleType id="car">
+		<attributes>
+			<attribute name="accessTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+			<attribute name="doorOperationMode" class="org.matsim.vehicles.VehicleType$DoorOperationMode">serial</attribute>
+			<attribute name="egressTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+		</attributes>
+		<length meter="7.5"/>
+		<width meter="1.0"/>
+		<passengerCarEquivalents pce="1.0"/>
+	</vehicleType>
+
+	<vehicleType id="ride">
+		<attributes>
+			<attribute name="accessTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+			<attribute name="doorOperationMode" class="org.matsim.vehicles.VehicleType$DoorOperationMode">serial</attribute>
+			<attribute name="egressTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+		</attributes>
+		<length meter="7.5"/>
+		<width meter="1.0"/>
+		<passengerCarEquivalents pce="1.0"/>
+	</vehicleType>
+
+	<vehicleType id="freight">
+		<attributes>
+			<attribute name="accessTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+			<attribute name="doorOperationMode" class="org.matsim.vehicles.VehicleType$DoorOperationMode">serial</attribute>
+			<attribute name="egressTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+		</attributes>
+		<length meter="15.0"/>
+		<width meter="1.0"/>
+		<passengerCarEquivalents pce="3.5"/>
+		<networkMode networkMode="truck"/>
+	</vehicleType>
+
+	<vehicleType id="truck">
+		<attributes>
+			<attribute name="accessTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+			<attribute name="doorOperationMode" class="org.matsim.vehicles.VehicleType$DoorOperationMode">serial</attribute>
+			<attribute name="egressTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+		</attributes>
+		<length meter="15.0"/>
+		<width meter="1.0"/>
+		<passengerCarEquivalents pce="3.5"/>
+		<networkMode networkMode="truck"/>
+	</vehicleType>
+
+	<!-- Specific types for commercial traffic -->
+
 	<vehicleType id="golf1.4">
 
 		<description>Golf 1.4 Trendline</description>
@@ -135,7 +185,7 @@
 
 		<description>Heavy Vehicle 40t</description>
 		<capacity seats="1" standingRoomInPersons="0" other="33.0"/>
-		<length meter="7.5"/>
+		<length meter="15"/>
 		<width meter="1.0"/>
 		<maximumVelocity meterPerSecond="22.22"/>
 		<engineInformation>