Merge branch 'use_emamopt2cpp' into 'master'

Use EMAMOpt2CPP instead of EMAM2CPP

See merge request !13

pom.xml

@@ -19,7 +19,7 @@
     <CNNTrain.version>0.2.5-SNAPSHOT</CNNTrain.version>
     <cnnarch-mxnet-generator.version>0.2.5-SNAPSHOT</cnnarch-mxnet-generator.version>
     <cnnarch-caffe2-generator.version>0.2.5-SNAPSHOT</cnnarch-caffe2-generator.version>
-    <embedded-montiarc-math-generator>0.0.25-SNAPSHOT</embedded-montiarc-math-generator>
+    <embedded-montiarc-math-opt-generator>0.1.0</embedded-montiarc-math-opt-generator>
     
         <!-- .. Libraries .................................................. -->
         <guava.version>18.0</guava.version>
@@ -63,8 +63,8 @@
 
         <dependency>
             <groupId>de.monticore.lang.monticar</groupId>
-            <artifactId>embedded-montiarc-math-generator</artifactId>
-            <version>${embedded-montiarc-math-generator}</version>
+            <artifactId>embedded-montiarc-math-opt-generator</artifactId>
+            <version>${embedded-montiarc-math-opt-generator}</version>
         </dependency>
 
         <dependency>

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

@@ -34,7 +34,7 @@ import de.monticore.lang.monticar.cnntrain._symboltable.ConfigurationSymbol;
 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.GeneratorEMAMOpt2CPP;
 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;
@@ -54,7 +54,7 @@ import java.util.*;
 
 public class EMADLGenerator {
 
-    private GeneratorCPP emamGen;
+    private GeneratorEMAMOpt2CPP emamGen;
     private CNNArchGenerator cnnArchGenerator;
     private CNNTrainGenerator cnnTrainGenerator;
 
@@ -62,7 +62,7 @@ public class EMADLGenerator {
 
 
     public EMADLGenerator(Backend backend) {
-        emamGen = new GeneratorCPP();
+        emamGen = new GeneratorEMAMOpt2CPP();
         emamGen.useArmadilloBackend();
         emamGen.setGenerationTargetPath("./target/generated-sources-emadl/");
         cnnArchGenerator = backend.getCNNArchGenerator();
@@ -95,7 +95,7 @@ public class EMADLGenerator {
         return getEmamGen().getGenerationTargetPath();
     }
 
-    public GeneratorCPP getEmamGen() {
+    public GeneratorEMAMOpt2CPP getEmamGen() {
         return emamGen;
     }