A bunch of fixes for tree part of SLEP

shogun-toolbox · Jun 25, 2012 · f765117 · f765117
1 parent 43fe9aa
commit f765117
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/shogun/lib/slep/slep_options.h b/src/shogun/lib/slep/slep_options.h
@@ -27,6 +27,7 @@ IGNORE_IN_CLASSLIST struct slep_options
 	int max_iter;
 	int restart_num;
 	int n_nodes;
+	int n_tasks;
 	int regularization;
 	int* ind;
 	double* ind_t;

diff --git a/src/shogun/lib/slep/slep_tree_mt_lsr.cpp b/src/shogun/lib/slep/slep_tree_mt_lsr.cpp
@@ -29,7 +29,7 @@ SGMatrix<double> slep_tree_mt_lsr(
 	double lambda, lambda_max, beta;
 	double funcp = 0.0, func = 0.0;
 
-	int n_tasks;
+	int n_tasks = options.n_tasks;
 
 	int iter = 1;
 	bool done = false;
@@ -186,17 +186,17 @@ SGMatrix<double> slep_tree_mt_lsr(
 		for (i=0; i<n_vecs; i++)
 			resid[i] = Aw[i] - y[i];
 
-		double tree_norm; 
+		double tree_norm = 0.0; 
 		for (i=0; i<n_feats; i++)
 		{
 			for (j=0; j<n_tasks; j++)
 				w_row[j] = w(i,j);
 
-			//if (options.general)
-			//	tree_norm += general_treeNorm(w_row,n_tasks,options.G,
-			//								 options.ind,options.n_nodes);
-			//else
-			//	tree_norm += treeNorm(w_row,n_tasks,options.ind,options.n_nodes);
+			if (options.general)
+				tree_norm += general_treeNorm(w_row,n_tasks,options.G,
+											 options.ind_t,options.n_nodes);
+			else
+				tree_norm += treeNorm(w_row,n_tasks,options.ind_t,options.n_nodes);
 		}
 
 		funcp = func;

diff --git a/src/shogun/lib/slep/tree/altra.cpp b/src/shogun/lib/slep/tree/altra.cpp
@@ -390,4 +390,5 @@ double findLambdaMax_mt(double *V, int n, int k, double *ind, int nodes)
 	   */
 
 	free(v);
+	return lambdaMax;
 }
diff --git a/src/shogun/lib/slep/tree/general_altra.cpp b/src/shogun/lib/slep/tree/general_altra.cpp
@@ -394,4 +394,5 @@ double general_findLambdaMax_mt(double *V, int n, int k, double *G, double *ind,
 	   */
 
 	free(v);
+	return lambdaMax;
 }