structuring input

1 files changed, 6 insertions, 8 deletions

diff --git a/main.cpp b/main.cpp
index 09821d2..1cb18b9 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <Eigen/Dense>
 #include <boost/program_options.hpp>
-#include <string>
+#include <list>
 #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<std::string>().c_str());
     FileDP dp(vm["feature"].as<std::string>().c_str());
-    DataSet D;
-    Labels L;
+    DataList D;
+    std::list<double> 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;
 }