remove get_strategy_type since we hope there would be no use of it.

shogun-toolbox · Apr 28, 2012 · b4fbbdb · b4fbbdb
1 parent 4574712
commit b4fbbdb
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 36 deletions.
diff --git a/src/shogun/multiclass/MulticlassOneVsOneStrategy.h b/src/shogun/multiclass/MulticlassOneVsOneStrategy.h
@@ -12,7 +12,7 @@
 
 namespace shogun
 {
-	
+
 class CMulticlassOneVsOneStrategy: public CMulticlassStrategy
 {
 public:
@@ -47,12 +47,6 @@ class CMulticlassOneVsOneStrategy: public CMulticlassStrategy
 		return num_classes*(num_classes-1)/2;
 	}
 
-	/** get strategy type */
-	virtual EMulticlassStrategy get_strategy_type()
-	{
-		return ONE_VS_ONE_STRATEGY;
-	}
-
 	/** get name */
 	virtual const char* get_name() const
 	{

diff --git a/src/shogun/multiclass/MulticlassOneVsRestStrategy.h b/src/shogun/multiclass/MulticlassOneVsRestStrategy.h
@@ -58,7 +58,7 @@ class CMulticlassOneVsRestStrategy: public CMulticlassStrategy
 
 	/** prepare for the next training phase.
 	 * @return NULL, since no subset is needed in one-vs-rest strategy
-	 */ 
+	 */
 	virtual SGVector<int32_t> train_prepare_next();
 
 	/** decide the final label.
@@ -75,12 +75,6 @@ class CMulticlassOneVsRestStrategy: public CMulticlassStrategy
 		return num_classes;
 	}
 
-	/** get strategy type */
-	virtual EMulticlassStrategy get_strategy_type()
-	{
-		return ONE_VS_REST_STRATEGY;
-	}
-
 	/** get name */
 	virtual const char* get_name() const
 	{

diff --git a/src/shogun/multiclass/MulticlassSVM.cpp b/src/shogun/multiclass/MulticlassSVM.cpp
@@ -127,16 +127,6 @@ bool CMulticlassSVM::load(FILE* modelfl)
 		line_number++;
 	}
 
-	int_buffer=0;
-	if (fscanf(modelfl," multiclass_strategy=%d; \n", &int_buffer) != 1)
-		SG_ERROR( "error in svm file, line nr:%d\n", line_number);
-
-	if (!feof(modelfl))
-		line_number++;
-
-	if (int_buffer != m_multiclass_strategy->get_strategy_type())
-		SG_ERROR("multiclass strategy does not match %ld vs. %ld\n", int_buffer, m_multiclass_strategy->get_strategy_type());
-
 	int_buffer=0;
 	if (fscanf(modelfl," num_classes=%d; \n", &int_buffer) != 1)
 		SG_ERROR( "error in svm file, line nr:%d\n", line_number);
@@ -275,7 +265,6 @@ bool CMulticlassSVM::save(FILE* modelfl)
 
 	SG_INFO( "Writing model file...");
 	fprintf(modelfl,"%%MultiClassSVM\n");
-	fprintf(modelfl,"multiclass_strategy=%d;\n", m_multiclass_strategy->get_strategy_type());
 	fprintf(modelfl,"num_classes=%d;\n", m_labels->get_num_classes());
 	fprintf(modelfl,"num_svms=%d;\n", m_machines->get_num_elements());
 	fprintf(modelfl,"kernel='%s';\n", m_kernel->get_name());

diff --git a/src/shogun/multiclass/MulticlassStrategy.h b/src/shogun/multiclass/MulticlassStrategy.h
@@ -18,14 +18,6 @@
 namespace shogun
 {
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-enum EMulticlassStrategy
-{
-	ONE_VS_REST_STRATEGY,
-	ONE_VS_ONE_STRATEGY,
-};
-#endif
-
 class CMulticlassStrategy: public CSGObject
 {
 public:
@@ -41,9 +33,6 @@ class CMulticlassStrategy: public CSGObject
 		return "MulticlassStrategy";
 	};
 
-	/** get strategy type */
-	virtual EMulticlassStrategy get_strategy_type()=0;
-
 	/** start training */
 	virtual void train_start(CLabels *orig_labels, CLabels *train_labels);