fix get_name in MKL classes fixing serialization / parameter framework

shogun-toolbox · Jul 9, 2013 · 206a880 · 206a880
1 parent 3c8ea00
commit 206a880
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/src/shogun/classifier/mkl/MKLClassification.h b/src/shogun/classifier/mkl/MKLClassification.h
@@ -40,6 +40,9 @@ class CMKLClassification : public CMKL
 		 */
 		virtual float64_t compute_sum_alpha();
 
+		/** @return object name */
+		virtual const char* get_name() const { return "MKLClassification"; }
+
 	protected:
 		/** check run before starting training (to e.g. check if labeling is
 		 * two-class labeling in classification case

diff --git a/src/shogun/classifier/mkl/MKLMulticlassGLPK.h b/src/shogun/classifier/mkl/MKLMulticlassGLPK.h
@@ -64,10 +64,7 @@ class MKLMulticlassGLPK: public MKLMulticlassOptimizationBase
 	virtual void computeweights(std::vector<float64_t> & weights2);
 
 	/** @return object name */
-	virtual const char* get_name() const
-	{
-      return "MKLMulticlassGLPK";
-	}
+	virtual const char* get_name() const { return "MKLMulticlassGLPK"; }
 
 protected:
 	/** Class Copy Constructor

diff --git a/src/shogun/classifier/mkl/MKLMulticlassGradient.h b/src/shogun/classifier/mkl/MKLMulticlassGradient.h
@@ -77,10 +77,7 @@ class MKLMulticlassGradient: public MKLMulticlassOptimizationBase
 	virtual void computeweights(std::vector<float64_t> & weights2);
 
 	/** @return object name */
-	virtual const char* get_name() const
-	{
-      return "MKLMulticlassGradient";
-	}
+	virtual const char* get_name() const { return "MKLMulticlassGradient"; }
 
 	/** sets p-norm parameter for MKL
 	*	 @param norm the MKL norm

diff --git a/src/shogun/classifier/mkl/MKLMulticlassOptimizationBase.h b/src/shogun/classifier/mkl/MKLMulticlassOptimizationBase.h
@@ -61,10 +61,7 @@ class MKLMulticlassOptimizationBase: public CSGObject
 	virtual void computeweights(std::vector<float64_t> & weights2);
 
 	/** @return object name */
-	virtual const char* get_name() const
-	{
-      return "MKLMulticlassOptimizationBase";
-	}
+	virtual const char* get_name() const { return "MKLMulticlassOptimizationBase"; }
 
 	/** sets p-norm parameter for MKL
 	*	 @param norm the MKL norm

diff --git a/src/shogun/classifier/mkl/MKLOneClass.h b/src/shogun/classifier/mkl/MKLOneClass.h
@@ -40,6 +40,9 @@ class CMKLOneClass : public CMKL
 		 */
 		virtual float64_t compute_sum_alpha();
 
+		/** @return object name */
+		virtual const char* get_name() const { return "MKLOneClass"; }
+
 	protected:
 		/** check run before starting training (to e.g. check if labeling is
 		 * two-class labeling in classification case

diff --git a/src/shogun/regression/svr/MKLRegression.h b/src/shogun/regression/svr/MKLRegression.h
@@ -43,6 +43,9 @@ class CMKLRegression : public CMKL
 		 */
 		virtual float64_t compute_sum_alpha();
 
+		/** @return object name */
+		virtual const char* get_name() const { return "MKLRegression"; }
+
 	protected:
 		/** check run before starting training (to e.g. check if labeling is
 		 * two-class labeling in classification case