Merge branch 'timmermanns' into 'master'

Moved generator from EmbeddedMontiArcDL to this repo.

See merge request !1

.circleci/config.yml

+#
+#
+#  ******************************************************************************
+#  MontiCAR Modeling Family, www.se-rwth.de
+#  Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
+#  All rights reserved.
+#
+#  This project is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 3.0 of the License, or (at your option) any later version.
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this project. If not, see <http://www.gnu.org/licenses/>.
+# *******************************************************************************
+#
+
+# Java Maven CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-java/ for more details
+#
+version: 2
+general:
+  branches:
+    ignore:
+      - gh-pages
+      
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      - image: circleci/openjdk:8-jdk
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+      # - image: circleci/postgres:9.4
+
+    working_directory: ~/repo
+
+    environment:
+      # Customize the JVM maximum heap limit
+      MAVEN_OPTS: -Xmx3200m
+
+    steps:
+      - checkout
+
+      # run tests!
+      - run: mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings "settings.xml"
+workflows:
+  version: 2
+  commit-workflow:
+    jobs:
+      - build
+  scheduled-workflow:
+    triggers:
+      - schedule:
+          cron: "30 1 * * *"
+          filters:
+            branches:
+              only: master
+
+    jobs:
+      - build
+

.gitignore

+target
+nppBackup
+.project
+.settings
+.classpath
+.idea
+.git
+
+*.iml
+

.travis.yml

+script:
+- git checkout ${TRAVIS_BRANCH}
+- mvn clean install cobertura:cobertura org.eluder.coveralls:coveralls-maven-plugin:report --settings "settings.xml"
+after_success:
+- if [ "${TRAVIS_BRANCH}" == "master" ]; then mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B deploy --debug --settings "./settings.xml"; fi

pom.xml

+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+
+  <!-- == PROJECT COORDINATES ============================================= -->
+
+  <groupId>de.monticore.lang.monticar</groupId>
+  <artifactId>embedded-montiarc-emadl-generator</artifactId>
+  <version>0.2.1-SNAPSHOT</version>
+
+  <!-- == PROJECT DEPENDENCIES ============================================= -->
+
+  <properties>
+
+    <!-- .. SE-Libraries .................................................. -->
+    <emadl.version>0.2.1-SNAPSHOT</emadl.version>
+    <CNNTrain.version>0.2.1-SNAPSHOT</CNNTrain.version>
+    <cnnarch-generator.version>0.2.1-SNAPSHOT</cnnarch-generator.version>
+    <embedded-montiarc-math-generator>0.0.9-SNAPSHOT</embedded-montiarc-math-generator>
+    
+        <!-- .. Libraries .................................................. -->
+        <guava.version>18.0</guava.version>
+        <junit.version>4.12</junit.version>
+        <logback.version>1.1.2</logback.version>
+        <jscience.version>4.3.1</jscience.version>
+
+        <!-- .. Plugins ....................................................... -->
+        <monticore.plugin>4.5.3-SNAPSHOT</monticore.plugin>
+        <assembly.plugin>2.5.4</assembly.plugin>
+        <compiler.plugin>3.3</compiler.plugin>
+        <source.plugin>2.4</source.plugin>
+        <shade.plugin>2.4.3</shade.plugin>
+
+    <!-- Classifiers -->
+    <grammars.classifier>grammars</grammars.classifier>
+    <cli.classifier>cli</cli.classifier>
+
+    <!-- .. Misc .......................................................... -->
+    <java.version>1.8</java.version>
+
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <github.global.server>github</github.global.server>
+  </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr4-runtime</artifactId>
+            <version>4.7.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+        </dependency>
+
+        <!-- MontiCore Dependencies -->
+
+        <dependency>
+            <groupId>de.monticore.lang.monticar</groupId>
+            <artifactId>embedded-montiarc-math-generator</artifactId>
+            <version>${embedded-montiarc-math-generator}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>de.monticore.lang.monticar</groupId>
+            <artifactId>cnnarch-mxnet-generator</artifactId>
+            <version>${cnnarch-generator.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>de.monticore.lang.monticar</groupId>
+            <artifactId>cnn-train</artifactId>
+            <version>${CNNTrain.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>de.monticore.lang.monticar</groupId>
+            <artifactId>cnn-train</artifactId>
+            <version>${CNNTrain.version}</version>
+            <classifier>${grammars.classifier}</classifier>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>de.monticore.lang.monticar</groupId>
+            <artifactId>embedded-montiarc-deeplearning</artifactId>
+            <version>${emadl.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>de.monticore.lang.monticar</groupId>
+            <artifactId>embedded-montiarc-deeplearning</artifactId>
+            <version>${emadl.version}</version>
+            <classifier>${grammars.classifier}</classifier>
+            <scope>provided</scope>
+        </dependency>
+
+
+        <!-- .. Test Libraries ............................................... -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jscience</groupId>
+            <artifactId>jscience</artifactId>
+            <version>${jscience.version}</version>
+        </dependency>
+
+    </dependencies>
+  
+
+  <!-- == PROJECT BUILD SETTINGS =========================================== -->
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.8.1</version>
+        <configuration>
+          <altDeploymentRepository>internal.repo::default::file://${project.build.directory}/external-dependencies</altDeploymentRepository>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.github.github</groupId>
+        <artifactId>site-maven-plugin</artifactId>
+        <version>0.12</version>
+        <configuration>
+          <server>github</server>
+          <message>Maven artifacts for ${project.version} ${project.artifactId}</message>  <!-- git commit message -->
+          <noJekyll>true</noJekyll>                                  <!-- disable webpage processing -->
+          <outputDirectory>${project.build.directory}/external-dependencies</outputDirectory> <!-- matches distribution management repository url above -->
+          <branch>refs/heads/master</branch>                       <!-- remote branch name -->
+          <includes><include>**/*</include></includes>
+          <repositoryName>external-dependencies</repositoryName>      <!-- github repo name -->
+          <repositoryOwner>EmbeddedMontiArc</repositoryOwner>    <!-- github username  -->
+          <merge>true</merge>
+        </configuration>
+        <executions>
+          <!-- run site-maven-plugin's 'site' target as part of the build's normal 'deploy' phase -->
+          <execution>
+            <goals>
+              <goal>site</goal>
+            </goals>
+            <phase>deploy</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- MontiCore Generation -->
+      <plugin>
+        <groupId>de.monticore.mojo</groupId>
+        <artifactId>monticore-maven-plugin</artifactId>
+        <version>${monticore.plugin}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- Other Configuration -->
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${compiler.plugin}</version>
+        <configuration>
+          <useIncrementalCompilation>true</useIncrementalCompilation>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <id>jar-with-dependencies</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <archive>
+                <manifest>
+                  <mainClass>de.monticore.lang.monticar.emadl.generator.EMADLGeneratorCli</mainClass>
+                </manifest>
+              </archive>
+              <descriptorRefs>
+                <descriptorRef>jar-with-dependencies</descriptorRef>
+              </descriptorRefs>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- Source Jar Configuration -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>${source.plugin}</version>
+        <executions>
+          <execution>
+            <id>create source jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+            <configuration>
+              <excludeResources>false</excludeResources>
+              <includes>
+                <include>**/*.java</include>
+                <include>**/*.ftl</include>
+              </includes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+	    <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.19.1</version>
+                <configuration>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.eluder.coveralls</groupId>
+                <artifactId>coveralls-maven-plugin</artifactId>
+                <version>4.3.0</version>
+                <configuration>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.7</version>
+                <configuration>
+                    <format>xml</format>
+                    <maxmem>256m</maxmem>
+                    <!-- aggregated reports for multi-module projects -->
+                    <aggregate>true</aggregate>
+                </configuration>
+</plugin>
+    </plugins>
+  </build>
+
+
+  <distributionManagement>
+    <repository>
+      <id>internal.repo</id>
+      <name>Temporary Staging Repository</name>
+      <url>file://${project.build.directory}/external-dependencies</url>
+    </repository>
+    <snapshotRepository>
+      <id>internal.repo</id>
+      <url>file://${project.build.directory}/external-dependencies</url>
+    </snapshotRepository>
+  </distributionManagement>
+</project>
+

src/license/se/license.txt

+
+ ******************************************************************************
+ MontiCAR Modeling Family, www.se-rwth.de
+ Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
+ All rights reserved.
+
+ This project is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3.0 of the License, or (at your option) any later version.
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this project. If not, see <http://www.gnu.org/licenses/>.
+*******************************************************************************

src/main/java/de/monticore/lang/monticar/emadl/generator/AbstractSymtab.java

+/**
+ *
+ *  ******************************************************************************
+ *  MontiCAR Modeling Family, www.se-rwth.de
+ *  Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
+ *  All rights reserved.
+ *
+ *  This project is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 3.0 of the License, or (at your option) any later version.
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this project. If not, see <http://www.gnu.org/licenses/>.
+ * *******************************************************************************
+ */
+package de.monticore.lang.monticar.emadl.generator;
+
+import de.monticore.ModelingLanguageFamily;
+import de.monticore.io.paths.ModelPath;
+import de.monticore.lang.embeddedmontiarc.LogConfig;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.ConstantPortSymbol;
+import de.monticore.lang.monticar.emadl._symboltable.EMADLLanguage;
+import de.monticore.lang.monticar.enumlang._symboltable.EnumLangLanguage;
+import de.monticore.lang.monticar.generator.cpp.converter.MathConverter;
+import de.monticore.lang.monticar.generator.optimization.ThreadingOptimizer;
+import de.monticore.lang.monticar.generator.order.nfp.TagBreakpointsTagSchema.TagBreakpointsTagSchema;
+import de.monticore.lang.monticar.generator.order.nfp.TagDelayTagSchema.TagDelayTagSchema;
+import de.monticore.lang.monticar.generator.order.nfp.TagExecutionOrderTagSchema.TagExecutionOrderTagSchema;
+import de.monticore.lang.monticar.generator.order.nfp.TagInitTagSchema.TagInitTagSchema;
+import de.monticore.lang.monticar.generator.order.nfp.TagMinMaxTagSchema.TagMinMaxTagSchema;
+import de.monticore.lang.monticar.generator.order.nfp.TagTableTagSchema.TagTableTagSchema;
+import de.monticore.lang.monticar.generator.order.nfp.TagThresholdTagSchema.TagThresholdTagSchema;
+import de.monticore.lang.monticar.streamunits._symboltable.StreamUnitsLanguage;
+import de.monticore.lang.monticar.struct._symboltable.StructLanguage;
+import de.monticore.lang.tagging._symboltable.TaggingResolver;
+import de.monticore.symboltable.GlobalScope;
+import de.monticore.symboltable.Scope;
+
+import java.nio.file.Paths;
+import java.util.Arrays;
+
+public class AbstractSymtab {
+    public static TaggingResolver createSymTabAndTaggingResolver(String... modelPath) {
+        Scope scope = createSymTab(modelPath);
+        TaggingResolver tagging = new TaggingResolver(scope, Arrays.asList(modelPath));
+        TagMinMaxTagSchema.registerTagTypes(tagging);
+        TagTableTagSchema.registerTagTypes(tagging);
+        TagBreakpointsTagSchema.registerTagTypes(tagging);
+        TagExecutionOrderTagSchema.registerTagTypes(tagging);
+        TagInitTagSchema.registerTagTypes(tagging);
+        TagThresholdTagSchema.registerTagTypes(tagging);
+        TagDelayTagSchema.registerTagTypes(tagging);
+        return tagging;
+    }
+
+    public static Scope createSymTab(String... modelPath) {
+        ConstantPortSymbol.resetLastID();
+        MathConverter.resetIDs();
+        ThreadingOptimizer.resetID();
+        ModelingLanguageFamily fam = new ModelingLanguageFamily();
+        EMADLLanguage montiArcLanguage = new EMADLLanguage();
+
+        fam.addModelingLanguage(montiArcLanguage);
+        fam.addModelingLanguage(new StreamUnitsLanguage());
+        fam.addModelingLanguage(new StructLanguage());
+        fam.addModelingLanguage(new EnumLangLanguage());
+        final ModelPath mp = new ModelPath();
+        for (String m : modelPath) {
+            mp.addEntry(Paths.get(m));
+        }
+        LogConfig.init();//TODO comment for debug output
+        GlobalScope scope = new GlobalScope(mp, fam);
+        de.monticore.lang.monticar.Utils.addBuiltInTypes(scope);
+        return scope;
+    }
+}

src/main/java/de/monticore/lang/monticar/emadl/generator/EMADLGenerator.java

+/**
+ *
+ *  ******************************************************************************
+ *  MontiCAR Modeling Family, www.se-rwth.de
+ *  Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
+ *  All rights reserved.
+ *
+ *  This project is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 3.0 of the License, or (at your option) any later version.
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this project. If not, see <http://www.gnu.org/licenses/>.
+ * *******************************************************************************
+ */
+package de.monticore.lang.monticar.emadl.generator;
+
+import com.google.common.base.Joiner;
+import com.google.common.base.Splitter;
+import de.monticore.io.paths.ModelPath;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.ComponentSymbol;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.ExpandedComponentInstanceSymbol;
+import de.monticore.lang.math.math._symboltable.MathStatementsSymbol;
+import de.monticore.lang.monticar.cnnarch._symboltable.ArchitectureSymbol;
+import de.monticore.lang.monticar.cnnarch.generator.CNNArchGenerator;
+import de.monticore.lang.monticar.cnntrain._symboltable.CNNTrainLanguage;
+import de.monticore.lang.monticar.cnntrain.generator.CNNTrainGenerator;
+import de.monticore.lang.monticar.emadl._cocos.EMADLCocos;
+import de.monticore.lang.monticar.generator.FileContent;
+import de.monticore.lang.monticar.generator.cpp.ArmadilloHelper;
+import de.monticore.lang.monticar.generator.cpp.GeneratorCPP;
+import de.monticore.lang.monticar.generator.cpp.SimulatorIntegrationHelper;
+import de.monticore.lang.monticar.generator.cpp.TypesGeneratorCPP;
+import de.monticore.lang.monticar.generator.cpp.converter.TypeConverter;
+import de.monticore.lang.tagging._symboltable.TaggingResolver;
+import de.monticore.symboltable.GlobalScope;
+import de.monticore.symboltable.Scope;
+import de.se_rwth.commons.Splitters;
+import de.se_rwth.commons.logging.Log;
+import freemarker.template.Template;
+import freemarker.template.TemplateException;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
+
+
+public class EMADLGenerator {
+
+    public static final String CNN_HELPER = "CNNTranslator";
+    public static final String CNN_TRAINER = "CNNTrainer";
+
+    private GeneratorCPP emamGen;
+
+    public EMADLGenerator() {
+        emamGen = new GeneratorCPP();
+        emamGen.useArmadilloBackend();
+        emamGen.setGenerationTargetPath("./target/generated-sources-emadl/");
+    }
+
+    private String modelsPath;
+
+    public String getModelsPath() {
+        return modelsPath;
+    }
+
+    public void setModelsPath(String modelsPath) {
+        if (!(modelsPath.substring(modelsPath.length() - 1).equals("/"))){
+            this.modelsPath = modelsPath + "/";
+        }
+        else {
+            this.modelsPath = modelsPath;
+        }
+    }
+
+    public void setGenerationTargetPath(String generationTargetPath){
+        if (!(generationTargetPath.substring(generationTargetPath.length() - 1).equals("/"))){
+            getEmamGen().setGenerationTargetPath(generationTargetPath + "/");
+        }
+        else {
+            getEmamGen().setGenerationTargetPath(generationTargetPath);
+        }
+    }
+
+    public String getGenerationTargetPath(){
+        return getEmamGen().getGenerationTargetPath();
+    }
+
+    public GeneratorCPP getEmamGen() {
+        return emamGen;
+    }
+
+    public void generate(String modelPath, String qualifiedName) throws IOException, TemplateException {
+        setModelsPath( modelPath );
+        TaggingResolver symtab = AbstractSymtab.createSymTabAndTaggingResolver(getModelsPath());
+        ComponentSymbol component = symtab.<ComponentSymbol>resolve(qualifiedName, ComponentSymbol.KIND).orElse(null);
+
+        List<String> splitName = Splitters.DOT.splitToList(qualifiedName);
+        String componentName = splitName.get(splitName.size() - 1);
+        String instanceName = componentName.substring(0, 1).toLowerCase() + componentName.substring(1);
+
+        if (component == null){
+            Log.error("Component with name '" + componentName + "' does not exist.");
+            System.exit(1);
+        }
+
+        ExpandedComponentInstanceSymbol instance = component.getEnclosingScope().<ExpandedComponentInstanceSymbol>resolve(instanceName, ExpandedComponentInstanceSymbol.KIND).get();
+
+        generateFiles(symtab, instance, symtab);
+    }
+
+    public void generateFiles(TaggingResolver taggingResolver, ExpandedComponentInstanceSymbol componentSymbol, Scope symtab) throws IOException {
+        List<FileContent> fileContents = generateStrings(taggingResolver, componentSymbol, symtab);
+
+        for (FileContent fileContent : fileContents) {
+            emamGen.generateFile(fileContent);
+        }
+    }
+
+    public List<FileContent> generateStrings(TaggingResolver taggingResolver, ExpandedComponentInstanceSymbol componentInstanceSymbol, Scope symtab){
+        List<FileContent> fileContents = new ArrayList<>();
+        Set<ExpandedComponentInstanceSymbol> allInstances = new HashSet<>();
+
+        generateComponent(fileContents, allInstances, taggingResolver, componentInstanceSymbol, symtab);
+
+        fileContents.add(generateCNNTrainer(allInstances, componentInstanceSymbol.getComponentType().getFullName().replaceAll("\\.", "_")));
+        fileContents.add(ArmadilloHelper.getArmadilloHelperFileContent());
+        TypesGeneratorCPP tg = new TypesGeneratorCPP();
+        fileContents.addAll(tg.generateTypes(TypeConverter.getTypeSymbols()));
+
+        if (emamGen.shouldGenerateMainClass()) {
+            //fileContents.add(emamGen.getMainClassFileContent(componentInstanceSymbol, fileContents.get(0)));
+        } else if (emamGen.shouldGenerateSimulatorInterface()) {
+            fileContents.addAll(SimulatorIntegrationHelper.getSimulatorIntegrationHelperFileContent());