Commit 2919c6f8 authored by Alexander David Hellwig's avatar Alexander David Hellwig
Browse files

Change armadillo import from "armadillo.h" -> "armadillo"

parent 705fed8e
Pipeline #107751 passed with stages
in 32 minutes and 15 seconds
......@@ -33,5 +33,5 @@ g++ -std=c++11 ^
-L"%HOME%\lib\win" ^
-o "%2\TestsForCurrentModel.exe" ^
"%1/test/tests_main.cpp" ^
-include %ARMADILLO_HOME%\include\armadillo.h ^
-include %ARMADILLO_HOME%\include\armadillo ^
-DARMA_DONT_USE_WRAPPER -lgdi32 -lopenblas -llibarpack-2
......@@ -35,5 +35,5 @@ g++ -std=c++11 \
-L"${HOME}/lib/linux" \
-o "${2}/TestsForCurrentModel" \
"${1}/test/tests_main.cpp" \
-include "${ARMADILLO_HOME}/include/armadillo.h" \
-include "${ARMADILLO_HOME}/include/armadillo" \
-DARMA_DONT_USE_WRAPPER -lopenblas
\ No newline at end of file
......@@ -28,7 +28,7 @@ public class ArmadilloHelperSource {
public static String armadilloHelperSourceCode = "#ifndef HELPERA_H\n" +
"#define HELPERA_H\n" +
"#include <iostream>\n" +
"#include \"armadillo.h\"\n" +
"#include \"armadillo\"\n" +
"#include <stdarg.h>\n" +
"#include <initializer_list>\n" +
"#include <fstream>\n" +
......
......@@ -100,7 +100,7 @@ public class LanguageUnitCPP extends LanguageUnit {
resultString += "#include \"octave/oct.h\"\n";
alreadyGeneratedIncludes.add("octave/oct");
} else if (MathConverter.curBackend.getBackendName().equals("ArmadilloBackend")) {
resultString += "#include \"" + MathConverter.curBackend.getIncludeHeaderName() + ".h\"\n";
resultString += "#include \"" + MathConverter.curBackend.getIncludeHeaderName() + "\"\n";
alreadyGeneratedIncludes.add(MathConverter.curBackend.getIncludeHeaderName());
}
for (Variable v : bluePrint.getVariables()) {
......
......@@ -84,9 +84,10 @@ public class TestConverter {
public static String getDefaultContent(ComponentStreamUnitsSymbol symbol) {
String fileContentString = "";
String filePostfix = MathConverter.curBackend.getIncludeHeaderName().equals("armadillo") ? "" : ".h";
fileContentString += "#ifndef M_PI\n" +
"#define M_PI 3.14159265358979323846\n" +
"#endif\n" + "#include \"" + MathConverter.curBackend.getIncludeHeaderName() + ".h\"\n";
"#endif\n" + "#include \"" + MathConverter.curBackend.getIncludeHeaderName() + filePostfix + "\"\n";
if (MathConverter.curBackend.getBackendName().equals("OctaveBackend")) {
fileContentString += "#include \"Helper.h\"\n";
......
#ifndef HELPERA_H
#define HELPERA_H
#include <iostream>
#include "armadillo.h"
#include "armadillo"
#include <stdarg.h>
#include <initializer_list>
using namespace arma;
......
......@@ -3,7 +3,7 @@
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#include "armadillo.h"
#include "armadillo"
#include "detection_objectDetector_spectralClusterer_1_.h"
using namespace arma;
class detection_objectDetector{
......
......@@ -3,7 +3,7 @@
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#include "armadillo.h"
#include "armadillo"
#include "detection_objectDetector_spectralClusterer_1__similarity.h"
#include "detection_objectDetector_spectralClusterer_1__normalizedLaplacian.h"
#include "detection_objectDetector_spectralClusterer_1__eigenSolver.h"
......
......@@ -3,7 +3,7 @@
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#include "armadillo.h"
#include "armadillo"
#include "HelperA.h"
using namespace arma;
class detection_objectDetector_spectralClusterer_1__eigenSolver{
......
......@@ -3,7 +3,7 @@
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#include "armadillo.h"
#include "armadillo"
#include "HelperA.h"
using namespace arma;
class detection_objectDetector_spectralClusterer_1__kMeansClustering{
......
......@@ -3,7 +3,7 @@
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#include "armadillo.h"
#include "armadillo"
#include "HelperA.h"
using namespace arma;
class detection_objectDetector_spectralClusterer_1__normalizedLaplacian{
......
......@@ -3,7 +3,7 @@
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#include "armadillo.h"
#include "armadillo"
#include "HelperA.h"
using namespace arma;
class detection_objectDetector_spectralClusterer_1__similarity{
......
#ifndef HELPERA_H
#define HELPERA_H
#include <iostream>
#include "armadillo.h"
#include "armadillo"
#include <stdarg.h>
#include <initializer_list>
using namespace arma;
......
......@@ -3,7 +3,7 @@
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#include "armadillo.h"
#include "armadillo"
#include "detection_objectDetector1_spectralClusterer.h"
using namespace arma;
class detection_objectDetector1{
......
......@@ -3,7 +3,7 @@
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#include "armadillo.h"
#include "armadillo"
#include "detection_objectDetector1_spectralClusterer_similarity.h"
#include "detection_objectDetector1_spectralClusterer_normalizedLaplacian.h"
#include "detection_objectDetector1_spectralClusterer_eigenSolver.h"
......
......@@ -3,7 +3,7 @@
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#include "armadillo.h"
#include "armadillo"
#include "HelperA.h"
using namespace arma;
class detection_objectDetector1_spectralClusterer_eigenSolver{
......
......@@ -3,7 +3,7 @@
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#include "armadillo.h"
#include "armadillo"
#include "HelperA.h"
using namespace arma;
class detection_objectDetector1_spectralClusterer_kMeansClustering{
......
......@@ -3,7 +3,7 @@
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#include "armadillo.h"
#include "armadillo"
#include "HelperA.h"
using namespace arma;
class detection_objectDetector1_spectralClusterer_normalizedLaplacian{
......
......@@ -3,7 +3,7 @@
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#include "armadillo.h"
#include "armadillo"
#include "HelperA.h"
using namespace arma;
class detection_objectDetector1_spectralClusterer_similarity{
......
#ifndef HELPERA_H
#define HELPERA_H
#include <iostream>
#include "armadillo.h"
#include "armadillo"
#include <stdarg.h>
#include <initializer_list>
using namespace arma;
......
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