Skip to content

Commit

Permalink
more mini-steps towards release
Browse files Browse the repository at this point in the history
  • Loading branch information
kainagel committed Dec 7, 2018
1 parent 27a634d commit 3831fbe
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 180 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ hs_err_pid*
/.project
/.classpath
/target/
/output/
output*
/bin/

/.idea/
Expand Down
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ This repository provides an open MATSim transport model for Berlin, provided by

Currently, there are two versions of the MATSim Open Berlin model:

#### 10pct scenario (scenarios/berlin-v5.2-10pct)
##### 10pct scenario (scenarios/berlin-v5.2-10pct)

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.2-1pct)
##### 1pct scenario (scenarios/berlin-v5.2-1pct)

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!

Expand All @@ -33,12 +33,13 @@ Go to https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/d
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.
1. Run VIA and enjoy.

### Downloading the repository
### Downloading the repository alternative 1: Download ZIP

1. Click on `Clone or download` and then on `Download ZIP`.
1. Unzip the repository.
1. Go to "Run the MATSim Berlin scenario" below.

### Cloning the repository
### Downloading the repository alternative 2: Clone the repository

##### Initial stuff (needs to be done once)

Expand All @@ -61,16 +62,16 @@ This will update your repository to the newest version.
### Run the MATSim Berlin scenario
(Requires either cloning or downloading the repository.)

#### ... using a runnable jar file (coming soon!)
1. There should be a file directly in the `matsim-berlin` directory with name approximately as `matsim-berlin-5.2-SNAPSHOT-jar-with-dependencies.jar`.
##### ... using a runnable jar file
1. There should be a file directly in the `matsim-berlin` directory with name approximately as `matsim-berlin-5.2-jar-with-dependencies.jar`.
1. Double-click on that file (in a file system browser). A simple GUI should open.
1. In the GUI, click on the "Choose" button for configuration file. Navigate to one of the `scenario` directories and load one of the configuration files.
1. Increase memory in the GUI.
1. Press the "Start MATSim" button. This should run MATSim.
1. "Open" the output directory. You can drag files into VIA as was already done above.
1. "Edit..." (in the GUI) the config file. Re-run MATSim.

#### ... using an IDE, e.g. Eclipse, IntelliJ
##### ... using an IDE, e.g. Eclipse, IntelliJ
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`.
Expand Down
Binary file added matsim-berlin-5.2-jar-with-dependencies.jar
Binary file not shown.
172 changes: 0 additions & 172 deletions src/main/java/org/matsim/run/KNRunBerlinScenario.java

This file was deleted.

0 comments on commit 3831fbe

Please sign in to comment.