structuring input

1 files changed, 13 insertions, 14 deletions

diff --git a/tools/dataProvider.h b/tools/dataProvider.h
index bff1f44..fbf554b 100644
--- a/tools/dataProvider.h
+++ b/tools/dataProvider.h
@@ -16,10 +16,6 @@
 //      Use -1 to indicate not yet labeled data
 //      -1s will be excluded from training
 
-typedef Eigen::MatrixXd DataSet;
-
-typedef Eigen::VectorXd Labels;
-
 typedef struct DataEntry{
     int qid;
     double rank;
@@ -29,28 +25,31 @@ typedef struct DataEntry{
 class DataList{
 private:
     int n;
-    std::list<DataEntry> data;
+    std::list<DataEntry*> data;
 public:
     int getSize(){return data.size();}
-    void addEntry(DataEntry d){data.push_front(d);}
+    void addEntry(DataEntry* d){data.push_front(d);}
     void setfSize(int fsize){n=fsize;}
     int getfSize(){return n;}
+    int clear(){
+        for (std::list<DataEntry*>::iterator i=data.begin(),end=data.end();i!=end;++i)
+            delete *i;
+        data.clear();
+    }
+    std::list<DataEntry*> getData(){
+        return data;
+    }
+    ~DataList(){
+        clear();
+    }
 };
 
 class DataProvider  //Virtual base class for data input
 {
 protected:
-    int size;
-    int attrSize;
     bool eof;
 public:
     DataProvider():eof(false){};
-    int getSize(){
-        return size;
-    }
-    int getAttrSize(){
-        return attrSize;
-    }
 
     bool EOFile(){return eof;}