From 4b5b73c722b8c64d3cc1f5865f536eccf00ee02d Mon Sep 17 00:00:00 2001 From: cllorca1 Date: Tue, 22 Mar 2022 10:01:42 +0100 Subject: [PATCH] debug changes to scale factors applied in slio and mito to the configuration of matsim --- .github/workflows/deployment.yml | 2 -- .../msm/io/input/readers/PersonsReader.java | 2 +- .../trafficAssignment/ConfigureMatsim.java | 21 ++++++++++++------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 1967b052..134ef555 100644 --- 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 index 73ba41f4..3a163483 100644 --- 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 index 0449107e..5f41df70 100644 --- 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);