diff --git a/README.md b/README.md index a68c4e78..f2085f8f 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) @@ -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 diff --git a/input/v6.0/berlin-v6.0.config.xml b/input/v6.0/berlin-v6.0.config.xml index 69afd298..71d9509c 100644 --- a/input/v6.0/berlin-v6.0.config.xml +++ b/input/v6.0/berlin-v6.0.config.xml @@ -2,7 +2,7 @@ - + @@ -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"/> - + - + - + @@ -108,25 +108,23 @@ - - + - - + + - + - + @@ -138,8 +136,8 @@ - - + + @@ -148,7 +146,7 @@ - + @@ -178,7 +176,7 @@ - + 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);