Updated to EMAM2CPP version 0.0.10

pom.xml

@@ -18,7 +18,7 @@
     <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>
+    <embedded-montiarc-math-generator>0.0.10</embedded-montiarc-math-generator>
     
         <!-- .. Libraries .................................................. -->
         <guava.version>18.0</guava.version>
@@ -27,7 +27,6 @@
         <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>
@@ -133,20 +132,6 @@
         <version>2.8.1</version>
       </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>

src/test/resources/models/cifar10/ArgMax.emadl

@@ -6,11 +6,11 @@ component ArgMax<Z(1:oo) n = 2>{
 
     implementation Math{
          maxIndex = 0;
-         Q maxValue = inputVector(0);
+         Q maxValue = inputVector(0); //should be inputVector(1) but bug in EMAM2CPP
 
-         for i = 1:(n - 1)
+         for i = 2:n //should be 2:n but bug in EMAM2CPP
             if inputVector(i) > maxValue
-                maxIndex = i;
+                maxIndex = i - 1;
                 maxValue = inputVector(i);
             end
          end

src/test/resources/target_code/cifar10_cifar10Classifier_calculateClass.h

@@ -18,10 +18,10 @@ void execute()
 {
 maxIndex = 0;
 double maxValue = inputVector(0);
-for( auto i=1;i<=(n-1);++i){
+for( auto i=2;i<=n;++i){
 if((inputVector(i) > maxValue)){
-maxIndex = i;
-maxValue = inputVector(i);
+maxIndex = i-1;
+maxValue = inputVector(i-1) ;
 }
 }
 }