Commit 2c0e9613 authored by Thomas Michael Timmermanns's avatar Thomas Michael Timmermanns
Browse files

Updated to EMAM2CPP version 0.0.10

parent 37122b54
Pipeline #55983 canceled with stages
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<emadl.version>0.2.1-SNAPSHOT</emadl.version> <emadl.version>0.2.1-SNAPSHOT</emadl.version>
<CNNTrain.version>0.2.1-SNAPSHOT</CNNTrain.version> <CNNTrain.version>0.2.1-SNAPSHOT</CNNTrain.version>
<cnnarch-generator.version>0.2.1-SNAPSHOT</cnnarch-generator.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 .................................................. --> <!-- .. Libraries .................................................. -->
<guava.version>18.0</guava.version> <guava.version>18.0</guava.version>
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
<jscience.version>4.3.1</jscience.version> <jscience.version>4.3.1</jscience.version>
<!-- .. Plugins ....................................................... --> <!-- .. Plugins ....................................................... -->
<monticore.plugin>4.5.3-SNAPSHOT</monticore.plugin>
<assembly.plugin>2.5.4</assembly.plugin> <assembly.plugin>2.5.4</assembly.plugin>
<compiler.plugin>3.3</compiler.plugin> <compiler.plugin>3.3</compiler.plugin>
<source.plugin>2.4</source.plugin> <source.plugin>2.4</source.plugin>
...@@ -133,20 +132,6 @@ ...@@ -133,20 +132,6 @@
<version>2.8.1</version> <version>2.8.1</version>
</plugin> </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 --> <!-- Other Configuration -->
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
......
...@@ -6,11 +6,11 @@ component ArgMax<Z(1:oo) n = 2>{ ...@@ -6,11 +6,11 @@ component ArgMax<Z(1:oo) n = 2>{
implementation Math{ implementation Math{
maxIndex = 0; 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 if inputVector(i) > maxValue
maxIndex = i; maxIndex = i - 1;
maxValue = inputVector(i); maxValue = inputVector(i);
end end
end end
......
...@@ -18,10 +18,10 @@ void execute() ...@@ -18,10 +18,10 @@ void execute()
{ {
maxIndex = 0; maxIndex = 0;
double maxValue = inputVector(0); double maxValue = inputVector(0);
for( auto i=1;i<=(n-1);++i){ for( auto i=2;i<=n;++i){
if((inputVector(i) > maxValue)){ if((inputVector(i) > maxValue)){
maxIndex = i; maxIndex = i-1;
maxValue = inputVector(i); maxValue = inputVector(i-1) ;
} }
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment