Merge pull request #481 from pluskid/multiclass-fix

Fix a bug in OvR strategy: inc counter in wrong point
shogun-toolbox · Apr 23, 2012 · 9cd129d · 9cd129d
2 parents eeaa056 + 0814c83
commit 9cd129d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/shogun/multiclass/MulticlassOneVsRestStrategy.cpp b/src/shogun/multiclass/MulticlassOneVsRestStrategy.cpp
@@ -20,12 +20,11 @@ CMulticlassOneVsRestStrategy::CMulticlassOneVsRestStrategy()
 CMulticlassOneVsRestStrategy::CMulticlassOneVsRestStrategy(CRejectionStrategy *rejection_strategy)
 	:CMulticlassStrategy(), m_num_machines(0), m_rejection_strategy(rejection_strategy)
 {
+	SG_REF(m_rejection_strategy);
 }
 
 SGVector<int32_t> CMulticlassOneVsRestStrategy::train_prepare_next()
 {
-	CMulticlassStrategy::train_prepare_next();
-
 	for (int32_t i=0; i < m_orig_labels->get_num_labels(); ++i)
 	{
 		if (m_orig_labels->get_int_label(i)==m_train_iter)
@@ -34,6 +33,9 @@ SGVector<int32_t> CMulticlassOneVsRestStrategy::train_prepare_next()
 			m_train_labels->set_label(i, -1.0);
 	}
 
+	// increase m_train_iter *after* setting labels
+	CMulticlassStrategy::train_prepare_next();
+
 	return SGVector<int32_t>();
 }