extends inRange

src/main/java/de/monticore/lang/monticar/generator/cpp/commands/ErodeCommand.java

@@ -153,6 +153,4 @@ public class ErodeCommand extends ArgumentNoReturnMathCommand{
             }
         };
     }
-
-
 }

src/main/java/de/monticore/lang/monticar/generator/cpp/commands/InRangeCommand.java

@@ -5,7 +5,9 @@ import de.monticore.lang.math._symboltable.matrix.MathMatrixAccessSymbol;
 import de.monticore.lang.math._symboltable.matrix.MathMatrixNameExpressionSymbol;
 import de.monticore.lang.monticar.generator.*;
 import de.monticore.lang.monticar.generator.cpp.BluePrintCPP;
+import de.monticore.lang.monticar.generator.cpp.MathExpressionProperties;
 import de.monticore.lang.monticar.generator.cpp.MathFunctionFixer;
+import de.monticore.lang.monticar.generator.cpp.converter.ComponentConverter;
 import de.monticore.lang.monticar.generator.cpp.converter.ExecuteMethodGenerator;
 import de.monticore.lang.monticar.generator.cpp.converter.MathConverter;
 import de.monticore.lang.monticar.generator.cpp.symbols.MathStringExpression;
@@ -45,13 +47,14 @@ public class InRangeCommand extends ArgumentNoReturnMathCommand{
     public void convertUsingArmadilloBackend(MathExpressionSymbol mathExpressionSymbol, BluePrint bluePrint) {
         MathMatrixNameExpressionSymbol mathMatrixNameExpressionSymbol = (MathMatrixNameExpressionSymbol) mathExpressionSymbol;
         mathMatrixNameExpressionSymbol.setNameToAccess("");
+        MathExpressionProperties properties = ComponentConverter.tuples.get(mathExpressionSymbol);
 
         BluePrintCPP bluePrintCPP = (BluePrintCPP) bluePrint;
         String valueListString = "";
         for (MathMatrixAccessSymbol accessSymbol : mathMatrixNameExpressionSymbol.getMathMatrixAccessOperatorSymbol().getMathMatrixAccessSymbols())
             MathFunctionFixer.fixMathFunctions(accessSymbol, bluePrintCPP);
 
-        Method inRangeHelperMethod = getInRangeHelperMethod();
+        Method inRangeHelperMethod = getInRangeHelperMethod(mathMatrixNameExpressionSymbol, bluePrintCPP, properties);
         valueListString += ExecuteMethodGenerator.generateExecuteCode(mathExpressionSymbol, new ArrayList<String>());
         List<MathMatrixAccessSymbol> newMatrixAccessSymbols = new ArrayList<>();
         MathStringExpression stringExpression = new MathStringExpression("inRangeHelper" + valueListString,mathMatrixNameExpressionSymbol.getMathMatrixAccessOperatorSymbol().getMathMatrixAccessSymbols());
@@ -64,32 +67,69 @@ public class InRangeCommand extends ArgumentNoReturnMathCommand{
 
     }
 
-    private Method getInRangeHelperMethod(){
+    private Method getInRangeHelperMethod(MathMatrixNameExpressionSymbol mathMatrixNameExpressionSymbol, BluePrintCPP bluePrintCPP, MathExpressionProperties properties){
         Method method = new Method("inRangeHelper", "void");
 
+        String typeNameIn = "";
+        String typeNameOut = "";
+
+        if(properties.isPreCV()){
+            typeNameIn = "cv::Mat";
+        } else {
+            typeNameIn = "arma::cube";
+        }
+
+        if(properties.isSucCV()){
+            typeNameOut = "cv::Mat";
+        }else {
+            typeNameOut = "arma::mat";
+        }
+
         //add parameters
         Variable src = new Variable();
-        method.addParameter(src, "src", "CommonMatrix", "cube", "");;
+        method.addParameter(src, "src", "CommonMatrix", typeNameIn, "");;
         Variable dst = new Variable();
-        method.addParameter(dst, "dst", "CommonMatrixType", "mat", "");
+        method.addParameter(dst, "dst", "CommonMatrixType", typeNameOut, "");
         Variable lowerBoundary = new Variable();
         method.addParameter(lowerBoundary, "lowerB", "colvec", "colvec", "" );
         Variable upperBoundary = new Variable();
         method.addParameter(upperBoundary, "upperB", "colvec", "colvec", "");
         //add an instruction to the method
-        method.addInstruction(methodBody());
+        method.addInstruction(methodBody(properties, typeNameIn, typeNameOut));
 
         return method;
     }
 
-    private Instruction methodBody(){
+    private Instruction methodBody(MathExpressionProperties properties, String typeNameIn, String typeNameOut){
         return new Instruction() {
             @Override
             public String getTargetLanguageInstruction() {
-                return "    cv::inRange(src, Scalar(lowerB(0), lowerB(1), lowerB(2)),\n" +
-                        "            Scalar(upperB(0), upperB(1), upperB(2)), dst);\n";
-            }
                 
+                String finalInstruction ="";
+
+                if (properties.isPreCV() && properties.isSucCV()) {
+                    finalInstruction += "    cv::inRange(src, cv::Scalar(lowerB(0), lowerB(1), lowerB(2)),\n" +
+                                        "            cv::Scalar(upperB(0), upperB(1), upperB(2)), dst);\n";
+                } else if (properties.isPreCV()) {
+                    finalInstruction += "    cv::Mat dstCV;\n" +
+                                        "    cv::inRange(src, cv::Scalar(lowerB(0), lowerB(1), lowerB(2)),\n" +
+                                        "            cv::Scalar(upperB(0), upperB(1), upperB(2)), dstCV);\n" +
+                                        "    dst = ConvHelper::to_arma(dstCV);\n";
+                } else if (properties.isSucCV()) {
+                    finalInstruction += "    cv::Mat srcCV;\n" +
+                                        "    srcCV = ConvHelper::to_cvmat(src);\n" +
+                                        "    cv::inRange(srcCV, cv::Scalar(lowerB(0), lowerB(1), lowerB(2)),\n" +
+                                        "            cv::Scalar(upperB(0), upperB(1), upperB(2)), dst);\n";
+                } else {
+                    finalInstruction += "    cv::Mat srcCV;\n" +
+                                        "    cv::Mat dstCV;\n" +
+                                        "    srcCV = ConvHelper::to_cvmat(src);\n" +
+                                        "    cv::inRange(srcCV, cv::Scalar(lowerB(0), lowerB(1), lowerB(2)),\n" +
+                                        "            cv::Scalar(upperB(0), upperB(1), upperB(2)), dstCV);\n" +
+                                        "    dst = ConvHelper::to_arma(dstCV);\n";
+                }
+                return  finalInstruction;
+            }
             @Override
             public boolean isConnectInstruction() {
                 return false;