Made inner iterations of malsar ported code safe

shogun-toolbox · Jul 17, 2012 · 48a7858 · 48a7858
1 parent b39de77
commit 48a7858
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/shogun/lib/slep/malsar_joint_feature_learning.cpp b/src/shogun/lib/slep/malsar_joint_feature_learning.cpp
@@ -97,8 +97,9 @@ slep_result_t malsar_joint_feature_learning(
 
 		double Fzp = 0.0;
 
+		int inner_iter = 0;
 		// line search, Armijo-Goldstein scheme
-		while (true)
+		while (inner_iter <= 1000)
 		{
 			// compute lasso projection of Ws - gWs/gamma
 			for (task=0; task<n_tasks; task++)
@@ -109,6 +110,7 @@ slep_result_t malsar_joint_feature_learning(
 			}
 			// walk in direction of antigradient 
 			Czp = Cs - gCs/gamma;
+			std::cout << Czp;
 
 			// compute objective at line search point
 			Fzp = 0.0;
@@ -151,6 +153,8 @@ slep_result_t malsar_joint_feature_learning(
 				break;
 			else
 				gamma *= gamma_inc;
+
+			inner_iter++;
 		}
 
 		Wz_old = Wz;

diff --git a/src/shogun/lib/slep/malsar_low_rank.cpp b/src/shogun/lib/slep/malsar_low_rank.cpp
@@ -96,8 +96,9 @@ slep_result_t malsar_low_rank(
 
 		double Fzp = 0.0;
 
+		int inner_iter = 0;
 		// line search, Armijo-Goldstein scheme
-		while (true)
+		while (inner_iter <= 1000)
 		{
 			// compute trace projection of Ws - gWs/gamma with 2*rho/gamma
 			internal::set_is_malloc_allowed(true);