Commit dceac76f authored by Ahmed's avatar Ahmed

use <> for include

parent 77c4f75a
......@@ -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)
......
......@@ -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");
}
}
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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{
......
......@@ -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{
......
......@@ -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{
......
......@@ -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{
......
......@@ -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;
......
......@@ -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{
......
......@@ -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{
......
......@@ -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{
......
......@@ -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{
......
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