use general features

shogun-toolbox · Dec 9, 2018 · ed74e6d · ed74e6d
1 parent 3822471
commit ed74e6d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/src/shogun/classifier/Perceptron.cpp b/src/shogun/classifier/Perceptron.cpp
@@ -39,7 +39,7 @@ void CPerceptron::init_model(CFeatures* data)
 		if (!data->has_property(FP_DOT))
 			SG_ERROR("Specified features are not of type CDotFeatures\n")
 		set_features((CDotFeatures*) data);
-		
+
 		SG_REF(data);
 		SG_UNREF(m_continue_features);
 		m_continue_features = data->as<CDotFeatures>();

diff --git a/src/shogun/classifier/svm/NewtonSVM.cpp b/src/shogun/classifier/svm/NewtonSVM.cpp
@@ -54,7 +54,7 @@ void CNewtonSVM::init_model(CFeatures* data)
 		if (!data->has_property(FP_DOT))
 			SG_ERROR("Specified features are not of type CDotFeatures\n")
 		set_features((CDotFeatures*) data);
-		
+
 		SG_REF(data);
 		SG_UNREF(m_continue_features);
 		m_continue_features = data->as<CDotFeatures>();

diff --git a/src/shogun/machine/IterativeMachine.h b/src/shogun/machine/IterativeMachine.h
@@ -32,21 +32,25 @@ namespace shogun
 		{
 			m_current_iteration = 0;
 			m_complete = false;
-			m_continue_features = NULL;
-			
+			m_continue_features = nullptr;
+
 			SG_ADD(
 			    &m_current_iteration, "current_iteration",
 			    "Current Iteration of training");
 			SG_ADD(
 			    &m_max_iterations, "max_iterations",
 			    "Maximum number of Iterations", ParameterProperties::HYPER);
 			SG_ADD(
-			    &m_complete, "complete", "Convergence status");
-		}
+			    &m_complete, "complete", "Convergence status",
+			    MS_NOT_AVAILABLE);
+			SG_ADD(
+			    &m_continue_features, "continue_features", "Continue Features",
+			    MS_NOT_AVAILABLE);
 
-		virtual ~CIterativeMachine()
-		{
-			SG_UNREF(m_continue_features);
+			virtual ~CIterativeMachine()
+			{
+		}
+		SG_UNREF(m_continue_features);
 		}
 
 		/** Returns convergence status */
@@ -58,8 +62,8 @@ namespace shogun
 		virtual bool continue_train()
 		{
 			this->reset_computation_variables();
-			this->set_features(m_continue_features);
-			
+			this->put("features", m_continue_features);
+
 			auto pb = SG_PROGRESS(range(m_max_iterations));
 			while (m_current_iteration < m_max_iterations && !m_complete)
 			{
@@ -114,9 +118,9 @@ namespace shogun
 		virtual void end_training()
 		{
 		}
-		
+
 		/** Stores features to continue training */
-		CDotFeatures* m_continue_features;
+		CFeatures* m_continue_features;
 		/** Maximum Iterations */
 		int32_t m_max_iterations;
 		/** Current iteration of training loop */