Commit e78a8ec7 authored by Jean Meurice's avatar Jean Meurice

Armadillo includes -> .h

parent 71b9df35
......@@ -28,7 +28,7 @@ public class ArmadilloHelperSource {
public static String armadilloHelperSourceCode = "#ifndef HELPERA_H\n" +
"#define HELPERA_H\n" +
"#include <iostream>\n" +
"#include \"armadillo\"\n" +
"#include \"armadillo.h\"\n" +
"#include <stdarg.h>\n" +
"#include <initializer_list>\n" +
"#include <fstream>\n" +
......
......@@ -96,12 +96,11 @@ public class LanguageUnitCPP extends LanguageUnit {
List<String> alreadyGeneratedIncludes = new ArrayList<>();
//includes
//add default include
if (MathConverter.curBackend.getBackendName().equals("OctaveBackend")) {
resultString += "#include \"octave/oct.h\"\n";
alreadyGeneratedIncludes.add("octave/oct");
} else if (MathConverter.curBackend.getBackendName().equals("ArmadilloBackend")) {
resultString += "#include \"" + MathConverter.curBackend.getIncludeHeaderName() + "\"\n";
alreadyGeneratedIncludes.add(MathConverter.curBackend.getIncludeHeaderName());
String backendName = MathConverter.curBackend.getBackendName();
if (backendName.equals("OctaveBackend") || backendName.equals("ArmadilloBackend")){
String includeHeaderName = MathConverter.curBackend.getIncludeHeaderName();
resultString += "#include \"" + includeHeaderName + ".h\"\n";
alreadyGeneratedIncludes.add(includeHeaderName);
}
for (Variable v : bluePrint.getVariables()) {
//TODO remove multiple same includes
......
#ifndef HELPERA_H
#define HELPERA_H
#include <iostream>
#include "armadillo"
#include "armadillo.h"
#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