Merged all SLEP solvers into one

shogun-toolbox · Jul 18, 2012 · 7565032 · 7565032
1 parent 53e4cff
commit 7565032
Show file tree

Hide file tree

Showing 15 changed files with 193 additions and 969 deletions.
diff --git a/src/shogun/classifier/FeatureBlockLogisticRegression.cpp b/src/shogun/classifier/FeatureBlockLogisticRegression.cpp
@@ -90,7 +90,7 @@ bool CFeatureBlockLogisticRegression::train_machine(CFeatures* data)
 				SG_ERROR("Group of features covers more vectors than available\n");
 
 			options.mode = FEATURE_GROUP;
-			slep_result_t result = slep_logistic(features, y.vector, m_z, options);
+			slep_result_t result = slep_solver(features, y.vector, m_z, options);
 
 			int32_t n_feats = features->get_dim_feature_space();
 			SGVector<float64_t> new_w(n_feats);
@@ -118,8 +118,9 @@ bool CFeatureBlockLogisticRegression::train_machine(CFeatures* data)
 			options.n_nodes = ind_t.vlen/3;
 			options.n_feature_blocks = ind_t.vlen/3;
 			options.mode = FEATURE_TREE;
+			options.loss = LEAST_SQUARES;
 
-			slep_result_t result = slep_logistic(features, y.vector, m_z, options);
+			slep_result_t result = slep_solver(features, y.vector, m_z, options);
 
 			int32_t n_feats = features->get_dim_feature_space();
 			SGVector<float64_t> new_w(n_feats);

diff --git a/src/shogun/classifier/L1LogisticRegression.cpp b/src/shogun/classifier/L1LogisticRegression.cpp
@@ -51,7 +51,7 @@ bool CL1LogisticRegression::train_machine(CFeatures* data)
 	options.max_iter = m_max_iter;
 	options.rsL2 = 0.0;
 
-	slep_result_t result = slep_logistic(features, y.vector, m_z, options);
+	slep_result_t result = slep_solver(features, y.vector, m_z, options);
 
 	int32_t n_feats = features->get_dim_feature_space();
 	SGVector<float64_t> new_w(n_feats);

diff --git a/src/shogun/lib/slep/slep_accel_grad_mtl.cpp b/src/shogun/lib/slep/slep_accel_grad_mtl.cpp
diff --git a/src/shogun/lib/slep/slep_accel_grad_mtl.h b/src/shogun/lib/slep/slep_accel_grad_mtl.h