Merge branch 'master' into ML_clustering

# Conflicts:
#	README.md

INSTALL_DEPENDENCIES.md

+# Dependencies needed to compile the generated projects
+## Note
+The generator creates compile scripts for all supported compilers. A project with ROS Middleware contains `compile.sh`, as only Linux is supported by ROS. A project with ROS2 contains `compile.sh` and `compileMsbuild.bat` as Linux and Windows(with Msbuild) are supported.
+If you are having problems compiling on Windows because of the path length limit, use `substCompileMsbuild.bat` or  `substCompileMingw.bat`.
+## All generated projects
+CMake, Make, a C++ compiler, and Armadillo are required to compile the generated projects.
+## Linux
+Gcc is recommended as the C++ compiler.
+Example install of all needed packages for ubuntu:
+```bash
+sudo apt install gcc cmake make
+```
+Then download Armadillo from here: [Linux](https://rwth-aachen.sciebo.de/s/igDWzLpdO5zYHBj/download?path=%2Fubuntu%2F18.10.24-armadillo-linux&files=armadillo-8.500.1-linux.zip) and set the environment variable `Armadillo_HOME` to the base dir of your installation.
+
+To check everything is installed correctly use whereis/ls:
+```bash
+$ whereis g++
+g++: /usr/bin/g++
+$ whereis cmake
+cmake: /usr/bin/cmake
+$ whereis make
+make: /usr/bin/make
+$ ls "$Armadillo_HOME/include"
+armadillo_bits armadillo.h
+```
+
+## Windows
+Mingw64 gcc is recommended as the C++ compiler. Download a version with all needed tools from [here](https://rwth-aachen.sciebo.de/s/igDWzLpdO5zYHBj/download?path=%2Fwin64&files=mingw64.zip).
+
+CMake for Windows: https://cmake.org/download/
+
+Make for Windows: http://gnuwin32.sourceforge.net/packages/make.htm
+
+Add the bin directories of all 3 to your PATH variable.
+
+Then download Armadillo from here: [Windows](https://rwth-aachen.sciebo.de/s/igDWzLpdO5zYHBj/download?path=%2Fwin64&files=armadillo-8.200.2.zip) and set the environment variable `Armadillo_HOME` to the base dir of your installation.
+To check everything is installed correctly use where/dir:
+```batch
+> where g++
+C:\mingw64\bin\g++.exe
+> where cmake
+C:\Program Files\CMake\bin\cmake.exe
+> where make
+C:\Program Files\make-3.81-bin\bin\make.exe
+> dir /b "%Armadillo_HOME%\include"
+armadillo
+armadillo.h
+...
+```
+
+Alternatively Msbuild can be used as a compiler. Download and install Build Tools für Visual Studio 2017 by visiting [this](https://visualstudio.microsoft.com/de/downloads/) site, and navigating to `Tools for Visual Studio 2017`.
+Set the environment variable `msbuild_HOME` to the Folder containing `vcvars64.bat`(Standard destination: "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build")
+
+To check everything is installed correctly use where/dir:
+```batch
+> where cmake
+C:\Program Files\CMake\bin\cmake.exe
+> dir /b "%Armadillo_HOME%\include"
+armadillo
+armadillo.h
+...
+> dir /b "%msbuild_HOME%"
+vcvars32.bat
+vcvars64.bat
+...
+> call "%msbuild_HOME%\vcvars64.bat"
+**********************************************************************
+** Visual Studio 2017 Developer Command Prompt v15.0
+** Copyright (c) 2017 Microsoft Corporation
+**********************************************************************
+[vcvarsall.bat] Environment initialized for: 'x64'
+
+> where msbuild
+C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild.exe
+```
+
+
+Please note: It is highly recommended, you stick to the exact versions as stated above. Otherwise you might run into trouble regarding the interplay between cmake/make and the Armadillo library. In particular problems have been reported using Cygwin.
+
+## Projects with roscpp generator
+Only for generated projects that contain a ROS adapter(e.g. "generators":["cpp","roscpp"]).
+ROS Kinetic currently only supports Linux and the installation is described [here](http://wiki.ros.org/kinetic/Installation/Ubuntu).
+Set the environment varialble `ROS_HOME` to the base of your ROS installation.
+
+## Projects with ros2cpp/rclcpp generator
+Only for generated projects that contain a ROS2 adapter(e.g. "generators":["cpp","rclcpp"]).
+Tested under ROS2 Bouncy and Crystal with Windows 10 and Ubuntu 18.04 respectively and the installation is described [here](https://index.ros.org/doc/ros2/Installation/).
+ROS2 under Windows can only be compiled with msbuild.
+Set the environment varialble `ROS2_HOME` to the base of your ROS2 installation.

QUICKSTART_DEVELOPER.md

+# Quickstart guide for generator developers
+- Download and install Java(8+), Maven, as well as Git.
+- Clone this repository:  
+  ```bash
+  cd your/project/directory
+  git clone https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/generators/EMAM2Middleware.git
+  ```
+- Build the project
+    - Using the command line:  
+    ```bash
+    cd EMAM2Middleware
+    mvn clean install -s settings.xml
+    ```
+    - Using Intellij Idea:
+        - Open and import the project
+        - Open the maven settings(ctrl+shift+a, search 'Maven settings'), tick 'Override' at 'User settings file' and select the 'settings.xml' from this Project
+        - Update all maven dependencies(ctrl+shift+a, seach 'Reimport All Maven Projects')
+        - Build the project(crtl+F9)
+- Make your changes
+
+## Compiling the Projects
+Options
+1. Add your new generated test projects to the integration tests(check the scripts in [src/test/bash/](src/test/bash/) as well as [.gitlab-ci.yml](.gitlab-ci.yml)) and let the CI/CD system compile them. Alternatively you can use Docker to run the integration tests locally(reference [README.md](README.md) , Section 'Running the Integration tests locally')
+2. Install all dependencies (reference [README.md](README.md) , Section 'Dependencies needed to compile the generated projects') and execute the generated compile scripts.
\ No newline at end of file

QUICKSTART_USER.md

+# Quickstart guide for generator users
+- Download the latest version of the generator from the [se-nexus](https://nexus.se.rwth-aachen.de/service/rest/repository/browse/public/de/monticore/lang/monticar/embedded-montiarc-math-middleware-generator/) (e.g. .../0.0.20-20190311.154342-1/embedded-montiarc-math-middleware-generator-0.0.20-20190311.154342-1-jar-with-dependencies.jar) and save it as mw-generator.jar
+- Create a `project.json` config file for your project
+    - make sure your model directory and root model are correct
+    - for examples see: [valid.json](src/test/resources/config/valid.json), [emadl.json](src/test/resources/config/emadl.json)
+    - Refer to the main [readme.md](README.md)(section CLI) to see all options.
+- Generate your project by running  
+```bash
+java -jar mw-generator.jar project.json
+```
+
+- Refer to the main [readme.md](README.md)(Section: Dependencies needed to compile the generated projects) for instructions on how to install the needed dependencies for compilation
+
+- Compile your project by running one of the generated compile scripts. E.g.:
+```bash
+cd defined/output/directory
+./compile.sh
+# or on Windows
+call compileMingw.bat
+# or
+call compileMsbuild.bat
+# or to avoid path length error:
+call substCompileMingw.bat
+```
+    
+For two example Projects using this generator see:
+- [Cooperative Intersection](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/applications/cooperativeintersection) (Uses EMAM, ROS, CoInCar Simulator)
+- [Autonomous driving](https://git.rwth-aachen.de/autonomousdriving/torcs_dl) (Uses EMADL, ROS, Torcs Simulator)
\ No newline at end of file

README.md

@@ -7,98 +7,17 @@ All communication of these 2 Components will then be tunneled trough the specifi
 ![MiddlewareAdapter](/uploads/6e9c69e6b56554579551769174df3697/MiddlewareAdapter.png)
 It also supports automatic clustering of the subcomponents to deploy on different machines.
 
-## Writing your own Middleware Generator
-see [TUTORIAL_ADD_MIDDLEWARE.md](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/generators/EMAM2Middleware/blob/master/TUTORIAL_ADD_MIDDLEWARE.md)
-
-## Dependencies needed to compile the generated projects
-### Note
-The generator creates compile scripts for all supported compilers. A project with ROS Middleware contains `compile.sh`, as only Linux is supported by ROS. A project with ROS2 contains `compile.sh` and `compileMsbuild.bat` as Linux and Windows(with Msbuild) are supported.
-If you are having problems compiling on Windows because of the path length limit, use `substCompileMsbuild.bat` or  `substCompileMingw.bat`.
-### All generated projects
-CMake, Make, a C++ compiler, and Armadillo are required to compile the generated projects.
-#### Linux
-Gcc is recommended as the C++ compiler.
-Example install of all needed packages for ubuntu:
-```bash
-sudo apt install gcc cmake make
-```
-Then download Armadillo from here: [Linux](https://rwth-aachen.sciebo.de/s/igDWzLpdO5zYHBj/download?path=%2Fubuntu%2F18.10.24-armadillo-linux&files=armadillo-8.500.1-linux.zip) and set the environment variable `Armadillo_HOME` to the base dir of your installation.
-
-To check everything is installed correctly use whereis/ls:
-```bash
-$ whereis g++
-g++: /usr/bin/g++
-$ whereis cmake
-cmake: /usr/bin/cmake
-$ whereis make
-make: /usr/bin/make
-$ ls "$Armadillo_HOME/include"
-armadillo_bits armadillo.h
-```
-
-#### Windows
-Mingw64 gcc is recommended as the C++ compiler. Download a version with all needed tools from [here](https://rwth-aachen.sciebo.de/s/igDWzLpdO5zYHBj/download?path=%2Fwin64&files=mingw64.zip).
-
-CMake for Windows: https://cmake.org/download/
+## Other important documents
+### Quickstart
+If you want to use the generator for your project, check out [QUICKSTART_USER.md](QUICKSTART_USER.md).
 
-Make for Windows: http://gnuwin32.sourceforge.net/packages/make.htm
+If you want to add features to this generator, check out [QUICKSTART_DEVELOPER.md](QUICKSTART_DEVELOPER.md)
 
-Add the bin directories of all 3 to your PATH variable.
-
-Then download Armadillo from here: [Windows](https://rwth-aachen.sciebo.de/s/igDWzLpdO5zYHBj/download?path=%2Fwin64&files=armadillo-8.200.2.zip) and set the environment variable `Armadillo_HOME` to the base dir of your installation.
-To check everything is installed correctly use where/dir:
-```batch
-> where g++
-C:\mingw64\bin\g++.exe
-> where cmake
-C:\Program Files\CMake\bin\cmake.exe
-> where make
-C:\Program Files\make-3.81-bin\bin\make.exe
-> dir /b "%Armadillo_HOME%\include"
-armadillo
-armadillo.h
-...
-```
-
-Alternatively Msbuild can be used as a compiler. Download and install Build Tools für Visual Studio 2017 by visiting [this](https://visualstudio.microsoft.com/de/downloads/) site, and navigating to `Tools for Visual Studio 2017`.
-Set the environment variable `msbuild_HOME` to the Folder containing `vcvars64.bat`(Standard destination: "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build")
-
-To check everything is installed correctly use where/dir:
-```batch
-> where cmake
-C:\Program Files\CMake\bin\cmake.exe
-> dir /b "%Armadillo_HOME%\include"
-armadillo
-armadillo.h
-...
-> dir /b "%msbuild_HOME%"
-vcvars32.bat
-vcvars64.bat
-...
-> call "%msbuild_HOME%\vcvars64.bat"
-**********************************************************************
-** Visual Studio 2017 Developer Command Prompt v15.0
-** Copyright (c) 2017 Microsoft Corporation
-**********************************************************************
-[vcvarsall.bat] Environment initialized for: 'x64'
-
-> where msbuild
-C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild.exe
-```
-
-
-Please note: It is highly recommended, you stick to the exact versions as stated above. Otherwise you might run into trouble regarding the interplay between cmake/make and the Armadillo library. In particular problems have been reported using Cygwin.
-
-### Projects with roscpp generator
-Only for generated projects that contain a ROS adapter(e.g. "generators":["cpp","roscpp"]).
-ROS Kinetic currently only supports Linux and the installation is described [here](http://wiki.ros.org/kinetic/Installation/Ubuntu).
-Set the environment varialble `ROS_HOME` to the base of your ROS installation.
+### Writing your own Middleware Generator
+see [TUTORIAL_ADD_MIDDLEWARE.md](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/generators/EMAM2Middleware/blob/master/TUTORIAL_ADD_MIDDLEWARE.md)
 
-### Projects with ros2cpp/rclcpp generator
-Only for generated projects that contain a ROS2 adapter(e.g. "generators":["cpp","rclcpp"]).
-Tested under ROS2 Bouncy and Crystal with Windows 10 and Ubuntu 18.04 respectively and the installation is described [here](https://index.ros.org/doc/ros2/Installation/).
-ROS2 under Windows can only be compiled with msbuild.
-Set the environment varialble `ROS2_HOME` to the base of your ROS2 installation.
+### Dependencies needed to compile the generated projects
+See [INSTALL_DEPENDENCIES.md](INSTALL_DEPENDENCIES.md)
 
 ## Usage
 ### CLI