diff --git a/README.md b/README.md index 6d029f3e..665b4fb2 100644 --- a/README.md +++ b/README.md @@ -7,17 +7,14 @@ This repository provides an open MATSim transport model for Berlin, provided by the [Transport Systems Planning and Transport Telematics group](https://www.vsp.tu-berlin.de) of [Technische Universität Berlin](http://www.tu-berlin.de). Please reference/cite the scenario based on this paper. - + -Currently, there are two versions of the MATSim Open Berlin model: +Currently, there are multiple versions of the MATSim Open Berlin model: -### 10pct scenario (`scenarios/berlin-v5.x-10pct`) +### 25pct scenario (`input/v6.0`) -This scenario contains a 10pct 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. - -### 1pct scenario (`scenarios/berlin-v5.x-1pct`) +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 a 1pct sample of the Greater Berlin population; road capacities are accordingly reduced. This scenario was not (!) calibrated and should only be used for testing purposes or pre-studies. ## Licenses @@ -28,8 +25,6 @@ The **MATSim input files, output files, analysis data and visualizations** are l
MATSim input files are those that are used as input to run MATSim. They often, but not always, have a header pointing to matsim.org. They typically reside in the `scenarios` directory hierarchy. MATSim output files, analysis data, and visualizations are files generated by MATSim runs, or by postprocessing. They typically reside in a directory hierarchy starting with `output`. -**Other data files**, in particular in `original-input-data`, have their own individual licenses that need to be individually clarified with the copyright holders. - ## Note Handling of large files within git is not without problems (git lfs files are not included in the zip download; we have to pay; ...). In consequence, large files, both on the input and on the output side, reside at https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin . @@ -40,7 +35,7 @@ Handling of large files within git is not without problems (git lfs files are no ### Movies 1. Go to https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/ -1. Decide for a scenario that you find interesting (e.g. `berlin-v5.x-10pct`) and go into that directory. +1. Decide for a scenario that you find interesting (e.g. `berlin-v6.0`) and go into that directory. 1. Inside there, look for an `output-*` directory that you find interesting and go into that directory. 1. Inside there, look for `movie-*` files. You can't watch them directly, but there are various ways to download them. You can watch them then. Try that. @@ -48,7 +43,7 @@ Handling of large files within git is not without problems (git lfs files are no 1. Get VIA from https://www.simunto.com/via/. (There is a free license for a small number of agents; that will probably work but only display a small number of vehicles/agents.) 1. Go to https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/ . -1. Decide for a scenario that you find interesting (e.g. `berlin-v5.x-1pct`) and go into that directory. +1. Decide for a scenario that you find interesting (e.g. `berlin-v6.0`) and go into that directory. 1. Inside there, look for an `output-*` directory that you find interesting and go into that directory. 1. Download `*.output_network.xml.gz` and `*.output_events.xml.gz`. Best make sure that they do not uncompress, e.g. by "Download linked file as ...". 1. Get these files into VIA. This can be achieved in various ways; one is to open VIA and then drag the files from a file browser into VIA. @@ -117,7 +112,7 @@ java -jar [FILENAME].jar 1. Set up the project in your IDE. 1. Make sure the project is configured as maven project. -1. Run the JAVA class `src/main/java/org/matsim/run/RunBerlinScenario.java` or `src/main/java/org/matsim/gui/RunBerlinScenarioGUI.java`. +1. Run the JAVA class `src/main/java/org/matsim/run/RunOpenBerlinScenario.java` or `src/main/java/org/matsim/gui/RunOpenBerlinScenarioGUI.java`. 1. "Open" the output directory. You can drag files into VIA as was already done above. 1. Edit the config file or adjust the run class. Re-run MATSim. diff --git a/input/v6.0/berlin-v6.0.config.xml b/input/v6.0/berlin-v6.0.config.xml index 922e0ff0..5821f708 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"/> - + - + - +