From 705f3731f4c49a75e2824d16622ff853634335c7 Mon Sep 17 00:00:00 2001 From: Joe Zhao Date: Fri, 10 Apr 2015 20:39:00 +0800 Subject: structuring input --- main.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index 09821d2..1cb18b9 100644 --- a/main.cpp +++ b/main.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include "tools/easylogging++.h" #include "model/ranksvmtn.h" #include "tools/fileDataProvider.h" @@ -21,13 +21,11 @@ int train() { // Generic training operations dp.open(); - DataSet D; - Labels L; + DataList D; LOG(INFO)<<"Training started"; dp.getDataSet(D); - dp.getLabel(L); - rsvm->train(D,L); + rsvm->train(D); LOG(INFO)<<"Training finished,saving model"; @@ -41,15 +39,15 @@ int predict() { RSVM *rsvm; rsvm = RSVM::loadModel(vm["model"].as().c_str()); FileDP dp(vm["feature"].as().c_str()); - DataSet D; - Labels L; + DataList D; + std::list L; while (!dp.EOFile()) { dp.getDataSet(D); rsvm->predict(D,L); } - Eigen::write_stream(std::cout, L); + // TODO output Eigen::write_stream(std::cout, L); delete rsvm; return 0; } -- cgit v1.2.3-70-g09d2