extract matsim properties from beam.conf to matsim.conf

src/main/scala/beam/sim/config/BeamConfig.scala

@@ -1,4 +1,4 @@
-// generated by tscfg 0.9.4 on Tue Dec 18 08:33:27 IST 2018
+// generated by tscfg 0.9.4 on Wed Dec 19 23:41:23 IST 2018
 // source: src/main/resources/beam-template.conf
 
 package beam.sim.config

test/input/beamville/beam.conf

@@ -1,5 +1,6 @@
 include "../common/akka.conf"
 include "../common/metrics.conf"
+include "../common/matsim.conf"
 
 
 ##################################################################
@@ -188,55 +189,7 @@ beam.routing {
   }
 }
 
-##################################################################
-# MATSim Conversion
-##################################################################
-
-matsim.conversion {
-  scenarioDirectory = "test/intput/siouxfalls"
-  populationFile = "Siouxfalls_population.xml"
-  matsimNetworkFile = "Siouxfalls_network_PT.xml"
-  generateVehicles = true
-  vehiclesFile = "Siouxfalls_vehicles.xml"
-  defaultHouseholdIncome {
-    currency = "usd"
-    period = "year"
-    value = 50000
-  }
-  osmFile = "south-dakota-latest.osm.pbf"
-  shapeConfig {
-    shapeFile = "tz46_d00.shp"
-    tazIdFieldName = "TZ46_D00_I"
-  }
-}
-
-##################################################################
-# MATSim Modules
-##################################################################
-
 matsim.modules {
-  global {
-    randomSeed = 4711
-    coordinateSystem = "Atlantis"
-  }
-  network {
-    inputNetworkFile = ${beam.inputDirectory}"/physsim-network.xml"
-  }
-  plans {
-    inputPlansFile = ${beam.inputDirectory}"/population.xml"
-    inputPersonAttributesFile = ${beam.inputDirectory}"/populationAttributes.xml"
-  }
-  households {
-    inputFile = ${beam.inputDirectory}"/households.xml"
-    inputHouseholdAttributesFile = ${beam.inputDirectory}"/householdAttributes.xml"
-  }
-
-  counts {
-    countsScaleFactor = 10.355
-    averageCountsOverIterations = 0
-    writeCountsInterval = ${beam.outputs.defaultWriteInterval}
-    outputformat = "all"
-  }
   strategy {
     maxAgentPlanMemorySize = 4
 
@@ -266,153 +219,4 @@ matsim.modules {
     #    ModuleProbability_4 = 0.1
     #    Module_4 = "ChangeTripMode"
   }
-  parallelEventHandling {
-    #Estimated number of events during mobsim run. An optional optimization hint for the framework.
-    estimatedNumberOfEvents = 100
-    #Number of threads for parallel events handler. 0 or null means the framework decides by itself.
-    numberOfThreads= 1
-    #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!
-    oneThreadPerHandler = 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.
-    synchronizeOnSimSteps = false
-  }
-  controler {
-    firstIteration = 0
-    lastIteration = 10
-    eventsFileFormat = "xml"
-    overwriteFiles = "overwriteExistingFiles"
-  }
-  qsim {
-    #"start/endTime" of MobSim (00:00:00 == take earliest activity time/ run as long as active vehicles exist) -->
-    startTime="00:00:00"
-    endTime="30:00:00"
-    #00:00:00 means NO snapshot writing
-    snapshotperiod = "00:00:00"
-  }
-  transit {
-    useTransit = false
-    transitModes = "pt"
-  }
-  changeMode {
-    modes="car,pt"
-  }
-  planCalcScore {
-    writeExperiencedPlans = true
-    learningRate = "1.0"
-    BrainExpBeta= "2.0"
-    lateArrival= "-18"
-    earlyDeparture = "-0"
-    performing = "6.0"
-    traveling="-6.0"
-    waiting="-0"
-
-    parameterset = [
-      {
-        type = "activityParams"
-        activityType = "Home"
-        priority = 1.0
-        scoringThisActivityAtAll = true
-        typicalDuration = "01:00:00"
-        typicalDurationScoreComputation = "uniform"
-      }, {
-        type = "activityParams"
-        activityType = "Work"
-        priority = 1.0
-        scoringThisActivityAtAll = true
-        typicalDuration = "9:00:00"
-        typicalDurationScoreComputation = "uniform"
-      }, {
-        type = "activityParams"
-        activityType = "Shopping"
-        priority = 1.0
-        scoringThisActivityAtAll = true
-        typicalDuration = "9:00:00"
-        typicalDurationScoreComputation = "uniform"
-      }, {
-        type = "activityParams"
-        activityType = "Social"
-        priority = 1.0
-        scoringThisActivityAtAll = true
-        typicalDuration = "4:00:00"
-        typicalDurationScoreComputation = "uniform"
-      }, {
-        type = "activityParams"
-        activityType = "Eatout"
-        priority = 1.0
-        scoringThisActivityAtAll = true
-        typicalDuration = "2:00:00"
-        typicalDurationScoreComputation = "uniform"
-      }, {
-        type = "activityParams"
-        activityType = "School"
-        priority = 1.0
-        scoringThisActivityAtAll = true
-        typicalDuration = "8:00:00"
-        typicalDurationScoreComputation = "uniform"
-      }, {
-        type = "activityParams"
-        activityType = "Escort"
-        priority = 1.0
-        scoringThisActivityAtAll = true
-        typicalDuration = "00:30:00"
-        typicalDurationScoreComputation = "uniform"
-      }, {
-        type = "activityParams"
-        activityType = "University"
-        priority = 1.0
-        scoringThisActivityAtAll = true
-        typicalDuration = "08:00:00"
-        typicalDurationScoreComputation = "uniform"
-      }, {
-        type = "activityParams"
-        activityType = "Other"
-        priority = 1.0
-        scoringThisActivityAtAll = true
-        typicalDuration = "02:00:00"
-        typicalDurationScoreComputation = "uniform"
-      }, {
-        type = "modeParams"
-        mode = "car"
-        constant = 0.0
-        marginalUtilityOfDistance_util_m = 0.0
-        marginalUtilityOfTraveling_util_hr = -6.0
-        monetaryDistanceRate = 0.0
-      }, {
-        type = "modeParams"
-        mode = "walk"
-        constant = 0.0
-        marginalUtilityOfDistance_util_m = 0.0
-        marginalUtilityOfTraveling_util_hr = -6.0
-        monetaryDistanceRate = 0.0
-      }, {
-        type = "modeParams"
-        mode = "bike"
-        constant = 0.0
-        marginalUtilityOfDistance_util_m = 0.0
-        marginalUtilityOfTraveling_util_hr = -6.0
-        monetaryDistanceRate = 0.0
-      }, {
-        type = "modeParams"
-        mode = "ride_hail"
-        constant = 0.0
-        marginalUtilityOfDistance_util_m = 0.0
-        marginalUtilityOfTraveling_util_hr = -6.0
-        monetaryDistanceRate = 0.0
-      }, {
-        type = "modeParams"
-        mode = "drive_transit"
-        constant = 0.0
-        marginalUtilityOfDistance_util_m = 0.0
-        marginalUtilityOfTraveling_util_hr = -6.0
-        monetaryDistanceRate = 0.0
-      }, {
-        type = "modeParams"
-        mode = "walk_transit"
-        constant = 0.0
-        marginalUtilityOfDistance_util_m = 0.0
-        marginalUtilityOfTraveling_util_hr = -6.0
-        monetaryDistanceRate = 0.0
-      }
-    ]
-  }
 }