Fixed includes in logistic regression classes

shogun-toolbox · Jul 18, 2012 · 5712c9a · 5712c9a
1 parent 1e888a0
commit 5712c9a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/shogun/classifier/FeatureBlockLogisticRegression.cpp b/src/shogun/classifier/FeatureBlockLogisticRegression.cpp
@@ -8,7 +8,7 @@
  */
 
 #include <shogun/classifier/FeatureBlockLogisticRegression.h>
-#include <shogun/lib/slep/slep_logistic.h>
+#include <shogun/lib/slep/slep_solver.h>
 #include <shogun/lib/slep/slep_options.h>
 
 #include <shogun/lib/IndexBlockGroup.h>
@@ -76,6 +76,7 @@ bool CFeatureBlockLogisticRegression::train_machine(CFeatures* data)
 	options.termination = m_termination;
 	options.tolerance = m_tolerance;
 	options.max_iter = m_max_iter;
+	options.loss = LOGISTIC;
 
 	EIndexBlockRelationType relation_type = m_feature_relation->get_relation_type();
 	switch (relation_type)

diff --git a/src/shogun/classifier/L1LogisticRegression.cpp b/src/shogun/classifier/L1LogisticRegression.cpp
@@ -8,7 +8,7 @@
  */
 
 #include <shogun/classifier/L1LogisticRegression.h>
-#include <shogun/lib/slep/slep_logistic.h>
+#include <shogun/lib/slep/slep_solver.h>
 #include <shogun/lib/slep/slep_options.h>
 
 namespace shogun
@@ -45,6 +45,7 @@ bool CL1LogisticRegression::train_machine(CFeatures* data)
 
 	slep_options options = slep_options::default_options();
 	options.mode = PLAIN;
+	options.loss = LOGISTIC;
 	options.regularization = m_regularization;
 	options.termination = m_termination;
 	options.tolerance = m_tolerance;