Commit cdc02390 authored by Michael Zbyszyński's avatar Michael Zbyszyński
Browse files

working on cmake includes. JSON failing

parent 6fee6615
......@@ -8,7 +8,28 @@ set (rapidmix_VERSION_MINOR 0)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
include_directories(src)
# Main lib
include_directories(${PROJECT_SOURCE_DIR}/src)
add_executable(rapidmix rapidmixCMake.cpp )
# RAPID-MIX dependencies
include_directories(dependencies/RapidLib/src)
include_directories(dependencies/xmm/src)
include_directories(dependencies/GVF)
include_directories(dependencies/Maximilian)
include_directories(dependencies/Maximilian/libs)
include_directories(dependencies/pipo/src/include)
include_directories(dependencies/pipo/src/host)
# Third party dependencies
include_directories(dependencies/third_party/json)
file(GLOB_RECURSE RM_SOURCES "${PROJECT_SOURCE_DIR}/src/*.cpp")
file(GLOB JSON_SRC "${PROJECT_SOURCE_DIR}/dependencies/third_party/json.cpp")
#Set the source for the main library, using the groups defined above
set(RAPIDMIX_SRC ${RM_SOURCES} ${JSON_SRC})
add_library(RMIX ${RAPIDMIX_SRC})
add_executable(rapidmix rapidmixCMake.cpp )
target_link_libraries(rapidmix RMIX)
#include <cassert>
#include <vector>
#include "rapidmix.h"
int main() {
//rapidmix::staticRegression myNN;
rapidmix::trainingData myData;
std::vector<double> input = { 0.2, 0.7 };
std::vector<double> output = { 3.0 };
myData.recordSingleElement("label", input, output);
input = { 2.0, 44.2 };
output = { 20.14 };
myData.recordSingleElement("label", input, output);
//myNN.train(myData);
std::vector<double> inputVec = { 1.618, 18.9 };
//assert(myNN.run(inputVec)[0] == 12.596715279688549);
return 0;
}
......@@ -16,8 +16,8 @@
#include "classification.h"
#include "regression.h"
#include "seriesClassification.h"
#include "rapidXMM.h"
#include "rapidGVF.h"
#include "./rapidXMM/rapidXMM.h"
#include "./rapidGVF/rapidGVF.h"
namespace rapidmix {
......
......@@ -6,7 +6,7 @@
//
#include "rapidGVF.h"
#include "trainingData.h"
#include "../trainingData.h"
rapidGVF::rapidGVF()
{
......
#include "rapidXMM.h"
#include "trainingData.h"
#include "machineLearning.h"
#include "../trainingData.h"
#include "../machineLearning.h"
static bool trainingData2xmmTrainingSet(const rapidmix::trainingData& data, xmm::TrainingSet& set) {
if (data.trainingSet.size() < 1) {
......
......@@ -48,7 +48,7 @@ namespace rapidmix {
// tempElement.uniqueId = assignCurrentId(); //TODO: how to do this? Do we need this?
tempElement.input = input;
tempElement.output = output;
tempElement.timeStamp = NULL;
//tempElement.timeStamp = NULL;
this->elements.push_back(tempElement);
}
};
......
......@@ -15,7 +15,7 @@
#include "maximilian.h"
#include "maxim.h"
#include "rapidStream.h"
#include "rapidPiPoTools.h"
#include "./rapidPiPoTools/rapidPiPoTools.h"
namespace rapidmix {
......
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