From 18ed589675b7887b1b49a47009784d1efe1057eb Mon Sep 17 00:00:00 2001
From: Joe Zhao <ztuowen@gmail.com>
Date: Wed, 20 May 2015 10:55:42 +0800
Subject: openmp cont

---
 CMakeLists.txt     | 2 +-
 model/rankaccu.cpp | 1 -
 model/ranksvm.cpp  | 8 ++++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ae8e51..c579851 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES ( "/usr/include/eigen3" )
 
 # Use Random Library for Random Number Generation
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fopenmp")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 FIND_PACKAGE( Boost COMPONENTS program_options REQUIRED )
 INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR})
diff --git a/model/rankaccu.cpp b/model/rankaccu.cpp
index f998e93..fc5b7b7 100644
--- a/model/rankaccu.cpp
+++ b/model/rankaccu.cpp
@@ -128,6 +128,5 @@ void rank_CMC(RidList &D,const std::vector<double> pred,CMC & cmc) {
                 cmc.addEntry(k-j);
                 break; // account only for the first match;
             }
-        j = i+1;
     }
 }
\ No newline at end of file
diff --git a/model/ranksvm.cpp b/model/ranksvm.cpp
index 068bf47..a468729 100644
--- a/model/ranksvm.cpp
+++ b/model/ranksvm.cpp
@@ -11,12 +11,12 @@ using namespace std;
 double C=1e-4;// Compensating & scaling
 
 // Main terminating criteria
-int maxiter = 50; // max iteration count
+int maxiter = 1; // max iteration count
 double prec=1e-10; // precision
 // conjugate gradient
-double cg_prec=1e-10; // precision
-int cg_maxiter = 5; // not worth having a large number
-int ls_maxiter = 10;
+double cg_prec=1e-3; // precision
+int cg_maxiter = 500;
+int ls_maxiter = 20;
 // line search
 double line_prec=1e-10; // precision
 double line_turb=1e-15; // purturbation
-- 
cgit v1.2.3-70-g09d2