dewarning

4 files changed, 10 insertions, 13 deletions

diff --git a/model/rankaccu.cpp b/model/rankaccu.cpp
index 1763e0f..910e3e0 100644
--- a/model/rankaccu.cpp
+++ b/model/rankaccu.cpp
@@ -3,7 +3,6 @@
 //
 
 #include "rankaccu.h"
-#include "../tools/easylogging++.h"
 
 using namespace std;
 
@@ -39,7 +38,7 @@ void rankmerge(int l,int r,vector<int> &C,vector<int> &rank,const vector<double>
     int i=l,j=((l+r)>>1)+1;
     rankmerge(i,j-1,C,rank,ref1,ref2);
     rankmerge(j,r,C,rank,ref1,ref2);
-    vector<int> stage_r(r-l+1),stage_c(r-l+1);
+    vector<int> stage_r((unsigned long)r-l+1),stage_c((unsigned long)r-l+1);
     int cnt=0;
     int k=0;
     while (i<=((l+r)>>1) && j<=r)
@@ -71,7 +70,7 @@ void rankmerge(int l,int r,vector<int> &C,vector<int> &rank,const vector<double>
     }
 }
 
-int rank_accu(DataList &D,const vector<double> pred)
+void rank_accu(DataList &D,const vector<double> pred)
 {
     unsigned long n = D.getSize();
     vector<int> orig_rank(n),pred_rank(n),C(n);
@@ -114,9 +113,9 @@ int rank_accu(DataList &D,const vector<double> pred)
     LOG(INFO)<<"over "<< cnt<< " queries. "<<"Average nDGC: "<< accu_nDCG/cnt<< " Average AP: "<<accu_AP/cnt;
 }
 
-int rank_CMC(DataList &D,const std::vector<double> pred,CMC & cmc) {
+void rank_CMC(DataList &D,const std::vector<double> pred,CMC & cmc) {
     unsigned long n = D.getSize();
-    vector<int> orig_rank(n),pred_rank(n),C(n);
+    vector<int> orig_rank(n),pred_rank(n);
     vector<double> orig(n);
     int i,j;
     for (i=0;i<D.getSize();++i)
diff --git a/model/rankaccu.h b/model/rankaccu.h
index adf1a1f..bcb8906 100644
--- a/model/rankaccu.h
+++ b/model/rankaccu.h
@@ -36,8 +36,8 @@ public:
     }
 };
 
-int rank_CMC(DataList &D,const std::vector<double> pred,CMC & cmc);
+void rank_CMC(DataList &D,const std::vector<double> pred,CMC & cmc);
 
-int rank_accu(DataList &D,const std::vector<double> pred);
+void rank_accu(DataList &D,const std::vector<double> pred);
 
 #endif //RANKSVM_RANKACCU_H
diff --git a/model/ranksvmtn.h b/model/ranksvmtn.h
index fd99d19..4074781 100644
--- a/model/ranksvmtn.h
+++ b/model/ranksvmtn.h
@@ -16,6 +16,4 @@ public:
     virtual int predict(DataList &D,std::vector<double> &res);
 };
 
-int cg_solve(const Eigen::MatrixXd &A, const Eigen::VectorXd &b, Eigen::VectorXd &x);
-
 #endif
\ No newline at end of file
diff --git a/tools/dataProvider.h b/tools/dataProvider.h
index a8a5448..1d430e4 100644
--- a/tools/dataProvider.h
+++ b/tools/dataProvider.h
@@ -26,11 +26,11 @@ private:
     int n;
     std::vector<DataEntry*> data;
 public:
-    int getSize(){return data.size();}
+    unsigned long getSize(){return data.size();}
     void addEntry(DataEntry* d){data.push_back(d);}
     void setfSize(int fsize){n=fsize;}
     int getfSize(){return n;}
-    int clear(){
+    void clear(){
         for (int i=0;i<data.size();++i)
             delete data[i];
         data.clear();
@@ -59,7 +59,7 @@ public:
     DataProvider():eof(false){};
 
     bool EOFile(){return eof;}
-    int getAllData(DataList &out){\
+    void getAllData(DataList &out){\
         out.clear();
         DataList buf;
         while (!EOFile())
@@ -69,8 +69,8 @@ public:
             // out.getData().insert(out.getData().end(),buf.getData().begin(),buf.getData().end());
             for (int i=0;i<buf.getSize();++i)
                 out.addEntry(out.copyEntry(buf.getData()[i]));
+            out.setfSize(buf.getfSize());
         }
-        out.setfSize(buf.getfSize());
     }
     virtual int getDataSet(DataList &out) = 0;
     virtual int open()=0;