From 31af2a18d0c7a1eaf9e037a7ad7512c020999573 Mon Sep 17 00:00:00 2001 From: rakow Date: Wed, 8 Nov 2023 15:44:44 +0100 Subject: [PATCH 01/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e9dfef67..33945897 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![Build Status](https://github.com/matsim-scenarios/matsim-berlin/workflows/build/badge.svg?branch=main) +[![Build Status](https://github.com/matsim-scenarios/matsim-berlin/actions/workflows/build.yaml/badge.svg?branch=main)](https://github.com/matsim-scenarios/matsim-berlin/actions/workflows/build.yaml) ![license](https://img.shields.io/github/license/matsim-scenarios/matsim-berlin.svg) ![JDK](https://img.shields.io/badge/JDK-17+-green.svg) From d04701b73c72475007163b6b4af22b5fd97adb28 Mon Sep 17 00:00:00 2001 From: rakow Date: Mon, 5 Feb 2024 14:08:51 +0100 Subject: [PATCH 02/12] adding comment --- input/v6.0/berlin-v6.0.config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/input/v6.0/berlin-v6.0.config.xml b/input/v6.0/berlin-v6.0.config.xml index 69afd298..9df0c59f 100644 --- a/input/v6.0/berlin-v6.0.config.xml +++ b/input/v6.0/berlin-v6.0.config.xml @@ -111,7 +111,7 @@ Euro/day: 11.76*(1+0.2017448) = 14.13252 Euro/m: 0.000124*(1+0.2017448) = 0.00014901635 --> - + From 6f12e6237cb23889c8f3a6c7c1b863e5b79fe566 Mon Sep 17 00:00:00 2001 From: vsp-gleich Date: Tue, 6 Feb 2024 12:00:37 +0100 Subject: [PATCH 03/12] add xml comment --- input/v6.0/berlin-v6.0.config.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/input/v6.0/berlin-v6.0.config.xml b/input/v6.0/berlin-v6.0.config.xml index 9df0c59f..e59184c6 100644 --- a/input/v6.0/berlin-v6.0.config.xml +++ b/input/v6.0/berlin-v6.0.config.xml @@ -108,20 +108,18 @@ - - + - + @@ -139,7 +137,7 @@ - + From ccf93fca7bac7483009b267e370120880ac43445 Mon Sep 17 00:00:00 2001 From: rakow Date: Wed, 7 Feb 2024 15:01:25 +0100 Subject: [PATCH 04/12] simplify if statements --- .../prepare/population/AssignIncome.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/matsim/prepare/population/AssignIncome.java b/src/main/java/org/matsim/prepare/population/AssignIncome.java index a8d8140c..4838f255 100644 --- a/src/main/java/org/matsim/prepare/population/AssignIncome.java +++ b/src/main/java/org/matsim/prepare/population/AssignIncome.java @@ -43,17 +43,16 @@ public void run(Person person) { double rndDouble = rnd.nextDouble(); if (rndDouble <= 0.1) income = 826.; - else if (rndDouble > 0.1 && rndDouble <= 0.2) income = 1142.; - else if (rndDouble > 0.2 && rndDouble <= 0.3) income = 1399.; - else if (rndDouble > 0.3 && rndDouble <= 0.4) income = 1630.; - else if (rndDouble > 0.4 && rndDouble <= 0.5) income = 1847.; - else if (rndDouble > 0.5 && rndDouble <= 0.6) income = 2070.; - else if (rndDouble > 0.6 && rndDouble <= 0.7) income = 2332.; - else if (rndDouble > 0.7 && rndDouble <= 0.8) income = 2659.; - else if (rndDouble > 0.8 && rndDouble <= 0.9) income = 3156.; - else if (rndDouble > 0.9) income = 4329.; + else if (rndDouble <= 0.2) income = 1142.; + else if (rndDouble <= 0.3) income = 1399.; + else if (rndDouble <= 0.4) income = 1630.; + else if (rndDouble <= 0.5) income = 1847.; + else if (rndDouble <= 0.6) income = 2070.; + else if (rndDouble <= 0.7) income = 2332.; + else if (rndDouble <= 0.8) income = 2659.; + else if (rndDouble <= 0.9) income = 3156.; else { - throw new RuntimeException("Aborting..." + rndDouble); + income = 4329.; } PersonUtils.setIncome(person, income); From 3e316080741c1172ea070b089a60beba3fe1c271 Mon Sep 17 00:00:00 2001 From: rakow Date: Wed, 7 Feb 2024 15:16:22 +0100 Subject: [PATCH 05/12] try noscan comments --- src/main/java/org/matsim/prepare/population/AssignIncome.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/matsim/prepare/population/AssignIncome.java b/src/main/java/org/matsim/prepare/population/AssignIncome.java index 4838f255..fc62d805 100644 --- a/src/main/java/org/matsim/prepare/population/AssignIncome.java +++ b/src/main/java/org/matsim/prepare/population/AssignIncome.java @@ -42,6 +42,9 @@ public void run(Person person) { double income = 0.; double rndDouble = rnd.nextDouble(); + // Disable SonarQube code duplication for this block + // BEGIN-NOSCAN + if (rndDouble <= 0.1) income = 826.; else if (rndDouble <= 0.2) income = 1142.; else if (rndDouble <= 0.3) income = 1399.; @@ -54,6 +57,7 @@ public void run(Person person) { else { income = 4329.; } + // END-NOSCAN PersonUtils.setIncome(person, income); } From d13aa4cbb89ad5fd5724f404c1b2ddc7c68fe16f Mon Sep 17 00:00:00 2001 From: rakow Date: Wed, 7 Feb 2024 15:20:31 +0100 Subject: [PATCH 06/12] remove unnecessary comments --- src/main/java/org/matsim/prepare/population/AssignIncome.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/org/matsim/prepare/population/AssignIncome.java b/src/main/java/org/matsim/prepare/population/AssignIncome.java index fc62d805..4838f255 100644 --- a/src/main/java/org/matsim/prepare/population/AssignIncome.java +++ b/src/main/java/org/matsim/prepare/population/AssignIncome.java @@ -42,9 +42,6 @@ public void run(Person person) { double income = 0.; double rndDouble = rnd.nextDouble(); - // Disable SonarQube code duplication for this block - // BEGIN-NOSCAN - if (rndDouble <= 0.1) income = 826.; else if (rndDouble <= 0.2) income = 1142.; else if (rndDouble <= 0.3) income = 1399.; @@ -57,7 +54,6 @@ public void run(Person person) { else { income = 4329.; } - // END-NOSCAN PersonUtils.setIncome(person, income); } From 3f1cb738078dfd86afcedfa5ce235687bf8b4ea5 Mon Sep 17 00:00:00 2001 From: rakow Date: Wed, 7 Feb 2024 15:58:38 +0100 Subject: [PATCH 07/12] update urls for 6.0 release --- input/v6.0/berlin-v6.0.config.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/input/v6.0/berlin-v6.0.config.xml b/input/v6.0/berlin-v6.0.config.xml index e59184c6..2f8817b9 100644 --- a/input/v6.0/berlin-v6.0.config.xml +++ b/input/v6.0/berlin-v6.0.config.xml @@ -19,10 +19,10 @@ - + - + @@ -30,13 +30,13 @@ value="https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/berlin-v5.5-10pct/input/berlin-v5-mode-vehicle-types.xml"/> - + - + - + From 5b3ec26d720ea3dd2eaa0b907de560251418d638 Mon Sep 17 00:00:00 2001 From: vsp-gleich Date: Thu, 8 Feb 2024 17:43:55 +0100 Subject: [PATCH 08/12] load all input files from public svn --- input/v6.0/berlin-v6.0.config.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/input/v6.0/berlin-v6.0.config.xml b/input/v6.0/berlin-v6.0.config.xml index 2f8817b9..69cd8ffb 100644 --- a/input/v6.0/berlin-v6.0.config.xml +++ b/input/v6.0/berlin-v6.0.config.xml @@ -87,7 +87,7 @@ - + @@ -176,7 +176,7 @@ - + From b1dade32a12be19c464e0d6d7ef1562cc866d443 Mon Sep 17 00:00:00 2001 From: vsp-gleich Date: Thu, 8 Feb 2024 18:19:41 +0100 Subject: [PATCH 09/12] set TimeAllocationMutator to 900.0s as used in run scripts --- input/v6.0/berlin-v6.0.config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/input/v6.0/berlin-v6.0.config.xml b/input/v6.0/berlin-v6.0.config.xml index 69cd8ffb..d8066040 100644 --- a/input/v6.0/berlin-v6.0.config.xml +++ b/input/v6.0/berlin-v6.0.config.xml @@ -2,7 +2,7 @@ - + From 59097f7b0686c75af983271ee78d7ba9ceee2ea9 Mon Sep 17 00:00:00 2001 From: rakow Date: Fri, 9 Feb 2024 09:49:07 +0100 Subject: [PATCH 10/12] Update berlin-v6.0.config.xml --- input/v6.0/berlin-v6.0.config.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/input/v6.0/berlin-v6.0.config.xml b/input/v6.0/berlin-v6.0.config.xml index d8066040..5308a1ef 100644 --- a/input/v6.0/berlin-v6.0.config.xml +++ b/input/v6.0/berlin-v6.0.config.xml @@ -22,7 +22,7 @@ - + @@ -87,7 +87,7 @@ - + From f5df4334f8161673bee8525c5cab5b48821cec41 Mon Sep 17 00:00:00 2001 From: mkreuschner <64031262+mkreuschner@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:15:30 +0100 Subject: [PATCH 11/12] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6a8fa766..f2085f8f 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Currently, there are multiple versions of the MATSim Open Berlin model: ### 10pct scenario (`input/v6.0`) -This scenario contains a 25pct sample of the Greater Berlin population; road capacities are accordingly reduced. The scenario is calibrated taking into consideration the traffic counts, modal split and mode-specific trip distance distributions. +This scenario contains both 10pct and 1pct sample of the Greater Berlin population; road capacities are accordingly reduced. The scenario is calibrated taking into consideration the traffic counts, modal split and mode-specific trip distance distributions. ## Licenses @@ -125,4 +125,4 @@ For more information about MATSim, see here: https://www.matsim.org/ ## Internal documentation Internal documentation can be found here: -https://docs.google.com/document/d/133CuXaMuWL0NcstyFHodk4y7J5yFLy9nrLtbBVpNWzM/edit?usp=drive_link \ No newline at end of file +https://docs.google.com/document/d/133CuXaMuWL0NcstyFHodk4y7J5yFLy9nrLtbBVpNWzM/edit?usp=drive_link From 4bd6115ffd57bd57a88be1d376944fa7c72e1507 Mon Sep 17 00:00:00 2001 From: rakow Date: Tue, 20 Feb 2024 10:58:20 +0100 Subject: [PATCH 12/12] update config with calibrated 10pct plans --- input/v6.0/berlin-v6.0.config.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/input/v6.0/berlin-v6.0.config.xml b/input/v6.0/berlin-v6.0.config.xml index 5308a1ef..71d9509c 100644 --- a/input/v6.0/berlin-v6.0.config.xml +++ b/input/v6.0/berlin-v6.0.config.xml @@ -22,7 +22,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -146,7 +146,7 @@ - +