Proper retraining of multiclass

shogun-toolbox · May 1, 2012 · 2c8ae73 · 2c8ae73
1 parent ca57115
commit 2c8ae73
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/src/shogun/lib/DynamicObjectArray.h b/src/shogun/lib/DynamicObjectArray.h
@@ -218,6 +218,13 @@ class CDynamicObjectArray : public CSGObject
 			m_array.clear_array();
 		}
 
+		/** resets the array */
+		inline void reset_array()
+		{
+			unref_all();
+			m_array.reset();
+		}
+
 		/** operator overload for array assignment
 		 *
 		 * @param orig original array

diff --git a/src/shogun/multiclass/MulticlassLibLinear.cpp b/src/shogun/multiclass/MulticlassLibLinear.cpp
@@ -111,7 +111,7 @@ bool CMulticlassLibLinear::train_machine(CFeatures* data)
 	                       m_max_iter,m_max_train_time,m_train_state);
 	solver.solve();
 
-	m_machines->clear_array();
+	m_machines->reset_array();
 	for (int32_t i=0; i<num_classes; i++)
 	{
 		CLinearMachine* machine = new CLinearMachine();

diff --git a/src/shogun/multiclass/MulticlassOCAS.cpp b/src/shogun/multiclass/MulticlassOCAS.cpp
@@ -122,7 +122,7 @@ bool CMulticlassOCAS::train_machine(CFeatures* data)
 	SG_DEBUG("QP exit flag [qp_exitflag] = %d \n",value.qp_exitflag);
 	SG_DEBUG("Exit flag [exitflag] = %d \n",value.exitflag);
 
-	m_machines->clear_array();
+	m_machines->reset_array();
 	for (int32_t i=0; i<num_classes; i++)
 	{
 		CLinearMachine* machine = new CLinearMachine();

diff --git a/src/shogun/multiclass/MulticlassSVM.cpp b/src/shogun/multiclass/MulticlassSVM.cpp
@@ -48,7 +48,7 @@ bool CMulticlassSVM::create_multiclass_svm(int32_t num_classes)
 	{
 		int32_t num_svms=m_multiclass_strategy->get_num_machines();
 
-		m_machines->clear_array();
+		m_machines->reset_array();
 		for (index_t i=0; i<num_svms; ++i)
 			m_machines->push_back(NULL);