diff options
Diffstat (limited to 'model/rankaccu.cpp')
| -rw-r--r-- | model/rankaccu.cpp | 9 |
1 files changed, 4 insertions, 5 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) |