diff --git a/.gitignore b/.gitignore index 3ff79f9c..521f7666 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ Thumbs.db *.eps *~ *.dot +/.classpath diff --git a/README.md b/README.md index 40fa5bb7..39328544 100644 --- a/README.md +++ b/README.md @@ -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. @@ -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) diff --git a/common/README.md b/common/README.md index 8a0183b0..169db307 100644 --- a/common/README.md +++ b/common/README.md @@ -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). diff --git a/consumption/README.md b/consumption/README.md index 9a63f08e..b3db48c3 100644 --- a/consumption/README.md +++ b/consumption/README.md @@ -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). diff --git a/core/README.md b/core/README.md index 5d6f9a18..ab742faf 100644 --- a/core/README.md +++ b/core/README.md @@ -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 @@ -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 -------------- @@ -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). diff --git a/misc/README.md b/misc/README.md index 1682d306..d28b2c60 100644 --- a/misc/README.md +++ b/misc/README.md @@ -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). diff --git a/sim/README.md b/sim/README.md index dce89391..83389a68 100644 --- a/sim/README.md +++ b/sim/README.md @@ -3,3 +3,9 @@ ## Description -------------- + +Commercial use +-------------- + +For commercial use, please contact the copyright holders at movsim@akesting.de + diff --git a/viewer/README.md b/viewer/README.md index c63351e6..b7a5b4e8 100644 --- a/viewer/README.md +++ b/viewer/README.md @@ -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 @@ -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). diff --git a/xsd/README.md b/xsd/README.md index 839a6ff5..eece12af 100644 --- a/xsd/README.md +++ b/xsd/README.md @@ -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 @@ -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).