From 47296445b3c5cbea101a5961ef784eb05c84f854 Mon Sep 17 00:00:00 2001
From: Joe Zhao <ztuowen@gmail.com>
Date: Wed, 13 May 2015 19:58:53 +0800
Subject: mem tested

---
 model/ranksvmtn.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'model/ranksvmtn.cpp')

diff --git a/model/ranksvmtn.cpp b/model/ranksvmtn.cpp
index d3ef3af..3136426 100644
--- a/model/ranksvmtn.cpp
+++ b/model/ranksvmtn.cpp
@@ -8,11 +8,12 @@ using namespace Eigen;
 
 const double C=1e-4; // Compensating & scaling
 // Main terminating criteria
-const int maxiter = 20; // max iteration count
+const int maxiter = 60; // max iteration count
 const double prec=1e-10; // precision
 // conjugate gradient
 const double cg_prec=1e-10; // precision
-const int cg_maxiter = 30;
+const int cg_maxiter = 10;
+const int ls_maxiter = 10;
 // line search
 const double line_prec=1e-10; // precision
 const double line_turb=1e-15; // purturbation
@@ -61,11 +62,13 @@ int cg_solve(RidList &D,const vector<int> &rank,const VectorXd &corr,const Vecto
     {
         // Non preconditioned version
         r_1 = res.dot(res);
+        if (iter)
+        LOG(INFO) << "CG iter "<<iter<<", r:"<<r_1;
         if (r_1<cg_prec) // Terminate condition
             break;
-        if (iter > cg_maxiter)
+        if (iter >= cg_maxiter)
         {
-            LOG(INFO) << "CG forced termination by maxiter, r:"<<r_1;
+            LOG(INFO) << "CG forced termination by maxiter";
             break;
         }
         if (iter){
@@ -178,9 +181,10 @@ int line_search(const VectorXd &w,RidList &D,const VectorXd &corr,const VectorXd
         if (g*g/h<line_prec)
             break;
         ++iter;
-        if (iter > cg_maxiter)
+        LOG(INFO) << "line search iter "<<iter<<", prec:"<<g*g/h;
+        if (iter >= ls_maxiter)
         {
-            LOG(INFO) << "line search forced termination by maxiter, prec:"<<g*g/h;
+            LOG(INFO) << "line search forced termination by maxiter";
             break;
         }
     }
-- 
cgit v1.2.3-70-g09d2