Skip to content

Commit

Permalink
updated md files
Browse files Browse the repository at this point in the history
  • Loading branch information
akegermany committed Apr 8, 2016
1 parent d551bdb commit 25cb6c8
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 40 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -26,3 +26,4 @@ Thumbs.db
*.eps
*~
*.dot
/.classpath
27 changes: 10 additions & 17 deletions README.md
Expand Up @@ -61,7 +61,7 @@ or via https (to prevent firewall problems)

git clone https://github.com/movsim/movsim.git

[Java](http://www.java.com/en/download/manual.jsp) is required at least in version 7 (JRE 1.7).
[Java](http://openjdk.java.net/install/index.html) is required at least in version 7 (JRE 1.7).

[Apache Maven] (http://maven.apache.org/download.html) is the software build and management tool for MovSim.

Expand Down Expand Up @@ -96,35 +96,28 @@ We follow the naming conventions of the [Git Flow Model](http://nvie.com/posts/a
## Demos
--------

There are a number of simulation scenarios defined in the [_sim_ directory](https://github.com/movsim/movsim/tree/master/sim).
There are a number of simulation scenarios defined in the [_sim_ directory](https://github.com/movsim/movsim/tree/develop/sim).

* Applet demos on the website www.movsim.org

* (MovSim v1.0) www.verkehrsdynamik.de/simulation.shtml

* (MovSim v1.2) www.movsim.org/app.shtml

* (Routing game) www.movsim.org


## Commercial Use
------------------
##Commercial use
--------------

For commercial use, please contact the copyright holders at movsim.org@gmail.com.
For commercial use, please contact the copyright holders at movsim@akesting.de


## Copyright and License
------------------------

MovSim is Copyright (C) 2010-2015 by Arne Kesting, Martin Treiber, Ralph Germ, and Martin Budden.
MovSim is Copyright (C) 2010-2016 by Arne Kesting, Martin Treiber, Ralph Germ, and Martin Budden.

MovSim is licensed under [GPL version 3](https://github.com/movsim/movsim/blob/develop/COPYING).

MovSim is licensed under [GPL version 3](https://github.com/movsim/movsim/blob/master/COPYING).
For general questions use the contact at movsim.org@gmail.com.

## References
-------------

[1] M. Treiber and A. Kesting. Traffic Flow Dynamics, Data, Models and Simulation.
Springer 2013. [Link](http://www.springer.com/physics/complexity/book/978-3-642-32459-8)
[1] M. Treiber and A. Kesting. [Traffic Flow Dynamics, Data, Models and Simulation](http://www.traffic-flow-dynamics.org). Springer 2013. [Link](http://www.springer.com/physics/complexity/book/978-3-642-32459-8)

[2] A. Kesting, M. Treiber, and D. Helbing. General lane-changing model MOBIL for car-following models.
Transportation Research Record, 86-94 (2007). [Paper](http://www.akesting.de/download/MOBIL_TRR_2007.pdf)
Expand Down
4 changes: 2 additions & 2 deletions common/README.md
Expand Up @@ -21,7 +21,7 @@ For commercial use, please contact the copyright holders at movsim@akesting.de
Copyright
---------

MovSim is Copyright (C) 2010, 2011, 2012, 2013 by Arne Kesting, Martin Treiber, Ralph Germ, and Martin Budden.
MovSim is Copyright (C) 2010-2016 by Arne Kesting, Martin Treiber, Ralph Germ, and Martin Budden.

MovSim is licensed under [GPL version 3](https://github.com/movsim/movsim/blob/master/COPYING).
MovSim is licensed under [GPL version 3](https://github.com/movsim/movsim/blob/develop/COPYING).

4 changes: 2 additions & 2 deletions consumption/README.md
Expand Up @@ -52,7 +52,7 @@ For commercial use, please contact the copyright holders at movsim@akesting.de
Copyright
---------

MovSim is Copyright (C) 2010, 2011 by Arne Kesting, Martin Treiber, Ralph Germ, and Martin Budden.
MovSim is Copyright (C) 2010-2016 by Arne Kesting, Martin Treiber, Ralph Germ, and Martin Budden.

MovSim is licensed under [GPL version 3](https://github.com/movsim/movsim/blob/master/COPYING).
MovSim is licensed under [GPL version 3](https://github.com/movsim/movsim/blob/develop/COPYING).

15 changes: 4 additions & 11 deletions core/README.md
Expand Up @@ -29,7 +29,7 @@ The `core` submodule provides the following features:
Installation
------------

For installation see the [README.md](https://github.com/movsim/movsim/blob/master/README.md) in the main MovSim directory.
For installation see the [README.md](https://github.com/movsim/movsim/blob/develop/README.md) in the main MovSim directory.


Usage
Expand All @@ -41,14 +41,7 @@ MovSim core can be run directly from the command-line. To see the MovSim options

java -jar target/MovsimCore-1.6.0-SNAPSHOT-jar-with-dependencies.jar -h

There are a number of predefined simulation scenarios defined in the [_sim_ directory](https://github.com/movsim/movsim/tree/master/sim). The `runmovsim` script can be used to run the simulator and gnuplot for plot these scenarios, for example:

cd ../sim/bookScenarioStartStop/
../../core/runmovsim -f startStop_IDM.xml
gnuplot startStop_IDM.gpl

The `.csv` output is put in the directory from which the simulator is called and the graphical output is put in `.eps` (Encapsulated PostScript) files.

There are a number of predefined simulation scenarios defined in the [_sim_ directory](https://github.com/movsim/movsim/tree/develop/sim). The `runmovsim` script can be used to run the simulator and gnuplot for plot these scenarios.

Logging output
--------------
Expand All @@ -67,7 +60,7 @@ For commercial use, please contact the copyright holders at movsim@akesting.de
Copyright
---------

MovSim is Copyright (C) 2010-2015 by Arne Kesting, Martin Treiber, Ralph Germ, and Martin Budden.
MovSim is Copyright (C) 2010-2016 by Arne Kesting, Martin Treiber, Ralph Germ, and Martin Budden.

MovSim is licensed under [GPL version 3](https://github.com/movsim/movsim/blob/master/COPYING).
MovSim is licensed under [GPL version 3](https://github.com/movsim/movsim/blob/develop/COPYING).

4 changes: 2 additions & 2 deletions misc/README.md
Expand Up @@ -21,7 +21,7 @@ For commercial use, please contact the copyright holders at movsim@akesting.de
Copyright
---------

MovSim is Copyright (C) 2010, 2011, 2012, 2013 by Arne Kesting, Martin Treiber, Ralph Germ, and Martin Budden.
MovSim is Copyright (C) 2010-2016 by Arne Kesting, Martin Treiber, Ralph Germ, and Martin Budden.

MovSim is licensed under [GPL version 3](https://github.com/movsim/movsim/blob/master/COPYING).
MovSim is licensed under [GPL version 3](https://github.com/movsim/movsim/blob/develop/COPYING).

6 changes: 6 additions & 0 deletions sim/README.md
Expand Up @@ -3,3 +3,9 @@

## Description
--------------

Commercial use
--------------

For commercial use, please contact the copyright holders at movsim@akesting.de

6 changes: 3 additions & 3 deletions viewer/README.md
Expand Up @@ -16,7 +16,7 @@ The `viewer` submodule provides a simple GUI interface for visualization.
Installation
------------

For installation see the [README.md](https://github.com/movsim/movsim/blob/master/README.md) in the main MovSim directory.
For installation see the [README.md](https://github.com/movsim/movsim/blob/develop/README.md) in the main MovSim directory.


Usage
Expand All @@ -32,13 +32,13 @@ The MovSim viewer can be started directly from the command-line. To see the MovS
Commercial use
--------------

For commercial use, please contact the copyright holders at movsim.org@gmail.com
For commercial use, please contact the copyright holders at movsim@akesting.de


Copyright
---------

MovSim is Copyright (C) 2010-2015 by Arne Kesting, Martin Treiber, Ralph Germ, and Martin Budden.
MovSim is Copyright (C) 2010-2016 by Arne Kesting, Martin Treiber, Ralph Germ, and Martin Budden.

MovSim is licensed under [GPL version 3](https://github.com/movsim/movsim/blob/master/COPYING).

6 changes: 3 additions & 3 deletions xsd/README.md
Expand Up @@ -15,7 +15,7 @@ The `MovsimXsd` submodule contains xsd schema resources for autogenerating class
Installation
------------

For installation see the [README.md](https://github.com/movsim/movsim/blob/master/README.md) in the main MovSim directory.
For installation see the [README.md](https://github.com/movsim/movsim/blob/develop/README.md) in the main MovSim directory.


Commercial use
Expand All @@ -27,7 +27,7 @@ For commercial use, please contact the copyright holders at movsim@akesting.de
Copyright
---------

MovSim is Copyright (C) 2010, 2011, 2012, 2013 by Arne Kesting, Martin Treiber, Ralph Germ, and Martin Budden.
MovSim is Copyright (C) 2010-2016 by Arne Kesting, Martin Treiber, Ralph Germ, and Martin Budden.

MovSim is licensed under [GPL version 3](https://github.com/movsim/movsim/blob/master/COPYING).
MovSim is licensed under [GPL version 3](https://github.com/movsim/movsim/blob/develop/COPYING).

0 comments on commit 25cb6c8

Please sign in to comment.