use <> for include

src/main/java/de/monticore/lang/monticar/generator/cpp/LanguageUnitCPP.java

@@ -131,7 +131,7 @@ public class LanguageUnitCPP extends LanguageUnit {
                 } else if (includeName.contains("ConvHelper")) {
                     resultString += "#include \"" + "ConvHelper" + ".h\"\n";
                 } else {
-                    resultString += "#include \"" + includeName + ".hpp\"\n";
+                    resultString += "#include <" + includeName + ".hpp>\n";
                 }
             }
         if (generatorCPP.isExecutionLoggingActive)

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

@@ -63,7 +63,7 @@ public class BoundingRectCommand extends MathCommand{
         newMatrixAccessSymbols.add(new MathMatrixAccessSymbol(stringExpression));
 
         mathMatrixNameExpressionSymbol.getMathMatrixAccessOperatorSymbol().setMathMatrixAccessSymbols(newMatrixAccessSymbols);
-        bluePrintCPP.addCVIncludeString("opencv2/imgproc");
+        bluePrintCPP.addCVIncludeString("opencv2/imgproc/imgproc");
 
     }
 }

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

@@ -61,8 +61,8 @@ public class CvtColorCommand extends ArgumentNoReturnMathCommand{
         newMatrixAccessSymbols.add(new MathMatrixAccessSymbol(stringExpression));
 
         mathMatrixNameExpressionSymbol.getMathMatrixAccessOperatorSymbol().setMathMatrixAccessSymbols(newMatrixAccessSymbols);
-        bluePrintCPP.addCVIncludeString("opencv2/imgproc");
         bluePrintCPP.addCVIncludeString("ConvHelper");
+        bluePrintCPP.addCVIncludeString("opencv2/imgproc/imgproc");
         bluePrint.addMethod(cvtColorHelperMethod);
         redefineArmaMat(bluePrintCPP);
         redefineInit(bluePrintCPP);

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

@@ -61,8 +61,8 @@ public class DilateCommand extends ArgumentNoReturnMathCommand{
         newMatrixAccessSymbols.add(new MathMatrixAccessSymbol(stringExpression));
 
         mathMatrixNameExpressionSymbol.getMathMatrixAccessOperatorSymbol().setMathMatrixAccessSymbols(newMatrixAccessSymbols);
-        bluePrintCPP.addCVIncludeString("opencv2/imgproc");
         bluePrintCPP.addCVIncludeString("ConvHelper");
+        bluePrintCPP.addCVIncludeString("opencv2/imgproc/imgproc");
         bluePrint.addMethod(dilateHelperMethod);
         redefineArmaMat(bluePrintCPP);
         redefineInit(bluePrintCPP);

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

@@ -63,8 +63,8 @@ public class ErodeCommand extends ArgumentNoReturnMathCommand{
 
 
         mathMatrixNameExpressionSymbol.getMathMatrixAccessOperatorSymbol().setMathMatrixAccessSymbols(newMatrixAccessSymbols);
-        bluePrintCPP.addCVIncludeString("opencv2/imgproc");
         bluePrintCPP.addCVIncludeString("ConvHelper");
+        bluePrintCPP.addCVIncludeString("opencv2/imgproc/imgproc");
         bluePrint.addMethod(erodeHelperMethod);
         redefineArmaMat(bluePrintCPP);
         redefineInit(bluePrintCPP);

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

@@ -61,8 +61,8 @@ public class FindContoursCommand extends ArgumentNoReturnMathCommand{
         newMatrixAccessSymbols.add(new MathMatrixAccessSymbol(stringExpression));
 
         mathMatrixNameExpressionSymbol.getMathMatrixAccessOperatorSymbol().setMathMatrixAccessSymbols(newMatrixAccessSymbols);
-        bluePrintCPP.addCVIncludeString("opencv2/imgproc");
         bluePrintCPP.addCVIncludeString("ConvHelper");
+        bluePrintCPP.addCVIncludeString("opencv2/imgproc/imgproc");
         bluePrintCPP.addCVIncludeString("vector");
         bluePrint.addMethod(findContoursHelperMethod);
         redefineArmaMat(bluePrintCPP);

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

@@ -63,8 +63,8 @@ public class GaussianBlurCommand extends ArgumentNoReturnMathCommand{
         newMatrixAccessSymbols.add(new MathMatrixAccessSymbol(stringExpression));
 
         mathMatrixNameExpressionSymbol.getMathMatrixAccessOperatorSymbol().setMathMatrixAccessSymbols(newMatrixAccessSymbols);
-        bluePrintCPP.addCVIncludeString("opencv2/imgproc");
         bluePrintCPP.addCVIncludeString("ConvHelper");
+        bluePrintCPP.addCVIncludeString("opencv2/imgproc/imgproc");
         bluePrint.addMethod(gaussianBlurHelperMethod);
         redefineArmaMat(bluePrintCPP);
         redefineInit(bluePrintCPP);

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

@@ -61,8 +61,8 @@ public class InRangeCommand extends ArgumentNoReturnMathCommand{
         newMatrixAccessSymbols.add(new MathMatrixAccessSymbol(stringExpression));
 
         mathMatrixNameExpressionSymbol.getMathMatrixAccessOperatorSymbol().setMathMatrixAccessSymbols(newMatrixAccessSymbols);
-        bluePrintCPP.addCVIncludeString("opencv2/core");
         bluePrintCPP.addCVIncludeString("ConvHelper");
+        bluePrintCPP.addCVIncludeString("opencv2/core/core");
         bluePrint.addMethod(inRangeHelperMethod);
         redefineArmaMat(bluePrintCPP);
         redefineInit(bluePrintCPP);

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

@@ -61,7 +61,7 @@ public class LargestContourCommand extends MathCommand {
 
 
         mathMatrixNameExpressionSymbol.getMathMatrixAccessOperatorSymbol().setMathMatrixAccessSymbols(newMatrixAccessSymbols);
-        bluePrintCPP.addCVIncludeString("opencv2/imgproc");
+        bluePrintCPP.addCVIncludeString("opencv2/imgproc/imgproc");
         bluePrint.addMethod(largestContourMethod);
         redefineArmaMat(bluePrintCPP);
         redefineInit(bluePrintCPP);

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

@@ -65,8 +65,8 @@ public class RectangleCommand extends MathCommand{
 
 
         mathMatrixNameExpressionSymbol.getMathMatrixAccessOperatorSymbol().setMathMatrixAccessSymbols(newMatrixAccessSymbols);
-        bluePrintCPP.addCVIncludeString("opencv2/imgproc");
         bluePrintCPP.addCVIncludeString("ConvHelper");
+        bluePrintCPP.addCVIncludeString("opencv2/imgproc/imgproc");
         bluePrint.addMethod(rectangleHelperMethod);
         redefineArmaMat(bluePrintCPP);
         redefineInit(bluePrintCPP);

src/test/resources/results/armadillo/testMath/l0/test_math_boundingRectCommandTest.h

@@ -4,7 +4,7 @@
 #define M_PI 3.14159265358979323846
 #endif
 #include "armadillo"
-#include "opencv2/imgproc.hpp"
+#include <opencv2/imgproc/imgproc.hpp>
 using namespace arma;
 using namespace std;
 class test_math_boundingRectCommandTest{

src/test/resources/results/armadillo/testMath/l0/test_math_cvtColorCommandTest.h

@@ -4,8 +4,8 @@
 #define M_PI 3.14159265358979323846
 #endif
 #include "armadillo"
-#include "opencv2/imgproc.hpp"
 #include "ConvHelper.h"
+#include <opencv2/imgproc/imgproc.hpp>
 using namespace arma;
 using namespace std;
 class test_math_cvtColorCommandTest{

src/test/resources/results/armadillo/testMath/l0/test_math_dilateCommandTest.h

@@ -4,8 +4,8 @@
 #define M_PI 3.14159265358979323846
 #endif
 #include "armadillo"
-#include "opencv2/imgproc.hpp"
 #include "ConvHelper.h"
+#include <opencv2/imgproc/imgproc.hpp>
 using namespace arma;
 using namespace std;
 class test_math_dilateCommandTest{

src/test/resources/results/armadillo/testMath/l0/test_math_erodeCommandTest.h

@@ -4,8 +4,9 @@
 #define M_PI 3.14159265358979323846
 #endif
 #include "armadillo"
-#include "opencv2/imgproc.hpp"
 #include "ConvHelper.h"
+#include <opencv2/imgproc/imgproc.hpp>
+
 using namespace arma;
 using namespace std;
 class test_math_erodeCommandTest{

src/test/resources/results/armadillo/testMath/l0/test_math_findContoursCommandTest.h

@@ -4,8 +4,8 @@
 #define M_PI 3.14159265358979323846
 #endif
 #include "armadillo"
-#include "opencv2/imgproc.hpp"
 #include "ConvHelper.h"
+#include <opencv2/imgproc/imgproc.hpp>
 #include <vector>
 using namespace arma;
 using namespace std;

src/test/resources/results/armadillo/testMath/l0/test_math_gaussianBlurCommandTest.h

@@ -4,8 +4,8 @@
 #define M_PI 3.14159265358979323846
 #endif
 #include "armadillo"
-#include "opencv2/imgproc.hpp"
 #include "ConvHelper.h"
+#include <opencv2/imgproc/imgproc.hpp>
 using namespace arma;
 using namespace std;
 class test_math_gaussianBlurCommandTest{

src/test/resources/results/armadillo/testMath/l0/test_math_inRangeCommandTest.h

@@ -4,8 +4,8 @@
 #define M_PI 3.14159265358979323846
 #endif
 #include "armadillo"
-#include "opencv2/core.hpp"
 #include "ConvHelper.h"
+#include <opencv2/core/core.hpp>
 using namespace arma;
 using namespace std;
 class test_math_inRangeCommandTest{

src/test/resources/results/armadillo/testMath/l0/test_math_largestContourCommandTest.h

@@ -4,7 +4,7 @@
 #define M_PI 3.14159265358979323846
 #endif
 #include "armadillo"
-#include "opencv2/imgproc.hpp"
+#include <opencv2/imgproc/imgproc.hpp>
 using namespace arma;
 using namespace std;
 class test_math_largestContourCommandTest{

src/test/resources/results/armadillo/testMath/l0/test_math_rectangleCommandTest.h

@@ -4,8 +4,8 @@
 #define M_PI 3.14159265358979323846
 #endif
 #include "armadillo"
-#include "opencv2/imgproc.hpp"
 #include "ConvHelper.h"
+#include <opencv2/imgproc/imgproc.hpp>
 using namespace arma;
 using namespace std;
 class test_math_rectangleCommandTest{