debug changes to scale factors applied in slio and mito to the config…

…uration of matsim
msmobility · Mar 22, 2022 · 4b5b73c · 4b5b73c
1 parent 19c0df5
commit 4b5b73c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -4,8 +4,6 @@ on:
   schedule:
     - cron: '0 1 * * 1' 
 
-
-
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/src/main/java/de/tum/bgu/msm/io/input/readers/PersonsReader.java b/src/main/java/de/tum/bgu/msm/io/input/readers/PersonsReader.java
@@ -98,7 +98,7 @@ public void processRecord(String[] record) {
                 if(dataSet.getJobs().containsKey(workplace)) {
                     occupation = (dataSet.getJobs().get(workplace));
                 } else {
-                    logger.warn("Person " + id + " declared as worker does not have a valid job!");
+                    //logger.warn("Person " + id + " declared as worker does not have a valid job!");
                 }
                 break;
             case STUDENT:

diff --git a/src/main/java/de/tum/bgu/msm/trafficAssignment/ConfigureMatsim.java b/src/main/java/de/tum/bgu/msm/trafficAssignment/ConfigureMatsim.java
@@ -16,11 +16,10 @@
 
 public class ConfigureMatsim {
 
-    private final static double SILO_SAMPLING_RATE = Resources.instance.getDouble(Properties.SP_SCALING_FACTOR, 1.0) *
-            Resources.instance.getDouble(Properties.SCALE_FACTOR_FOR_TRIP_GENERATION, 1.0);
-
     public static Config configureMatsim() {
 
+
+
         //String outputDirectory = outputDirectoryRoot + "/" + runId + "/";
         //matsimConfig.controler().setRunId(runId);
         //matsimConfig.controler().setOutputDirectory(outputDirectory);
@@ -116,8 +115,11 @@ public static Config configureMatsim() {
         config.controler().setWriteEventsInterval(config.controler().getLastIteration());
 
         config.qsim().setStuckTime(10);
-        config.qsim().setFlowCapFactor(SILO_SAMPLING_RATE * Double.parseDouble(Resources.instance.getString(Properties.TRIP_SCALING_FACTOR)));
-        config.qsim().setStorageCapFactor(SILO_SAMPLING_RATE * Double.parseDouble(Resources.instance.getString(Properties.TRIP_SCALING_FACTOR)));
+
+        double siloSamplingFactor = Resources.instance.getDouble(Properties.SP_SCALING_FACTOR, 1.0) *
+                Resources.instance.getDouble(Properties.SCALE_FACTOR_FOR_TRIP_GENERATION, 1.0);
+        config.qsim().setFlowCapFactor(siloSamplingFactor * Double.parseDouble(Resources.instance.getString(Properties.TRIP_SCALING_FACTOR)));
+        config.qsim().setStorageCapFactor(siloSamplingFactor * Double.parseDouble(Resources.instance.getString(Properties.TRIP_SCALING_FACTOR)));
 
 
         String[] networkModes = Resources.instance.getArray(Properties.MATSIM_NETWORK_MODES, new String[]{"autoDriver"});
@@ -135,9 +137,14 @@ public static Config configureMatsim() {
         return config;
     }
 
+
+
     public static void setDemandSpecificConfigSettings(Config config) {
-        config.qsim().setFlowCapFactor(SILO_SAMPLING_RATE * Double.parseDouble(Resources.instance.getString(Properties.TRIP_SCALING_FACTOR)));
-        config.qsim().setStorageCapFactor(SILO_SAMPLING_RATE * Double.parseDouble(Resources.instance.getString(Properties.TRIP_SCALING_FACTOR)));
+
+        double siloSamplingFactor = Resources.instance.getDouble(Properties.SP_SCALING_FACTOR, 1.0) *
+                Resources.instance.getDouble(Properties.SCALE_FACTOR_FOR_TRIP_GENERATION, 1.0);
+        config.qsim().setFlowCapFactor(siloSamplingFactor * Double.parseDouble(Resources.instance.getString(Properties.TRIP_SCALING_FACTOR)));
+        config.qsim().setStorageCapFactor(siloSamplingFactor * Double.parseDouble(Resources.instance.getString(Properties.TRIP_SCALING_FACTOR)));
 
         PlanCalcScoreConfigGroup.ActivityParams homeActivity = new PlanCalcScoreConfigGroup.ActivityParams("home");
         homeActivity.setTypicalDuration(12 * 60 * 60);
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,8 +4,6 @@ on: @@
       schedule:
         - cron: '0 1 * * 1'
     jobs:
       build:
         runs-on: ubuntu-latest
@@ Expand Down @@