+ return problem type in regression machines

shogun-toolbox · May 22, 2012 · bfab371 · bfab371
1 parent 29c5724
commit bfab371
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 9 deletions.
diff --git a/src/shogun/regression/GaussianProcessRegression.h b/src/shogun/regression/GaussianProcessRegression.h
@@ -38,16 +38,17 @@ namespace shogun
 class CGaussianProcessRegression : public CMachine
 {
 	public:
+		MACHINE_PROBLEM_TYPE(PT_REGRESSION);
 
-	/** constructor
-	 *
-	 * @param sigma variance of the Gaussian observation noise
-	 * @param k Kernel for covariance matrix
-	 * @param data training data
-	 * @param lab labels
-	 */
-	CGaussianProcessRegression(float64_t sigma, CKernel* k, 
-				   CDenseFeatures<float64_t>* data, CLabels* lab);
+		/** constructor
+		 *
+		 * @param sigma variance of the Gaussian observation noise
+		 * @param k Kernel for covariance matrix
+		 * @param data training data
+		 * @param lab labels
+		 */
+		CGaussianProcessRegression(float64_t sigma, CKernel* k, 
+					   CDenseFeatures<float64_t>* data, CLabels* lab);
 
 		  /** default constructor */
 		CGaussianProcessRegression();

diff --git a/src/shogun/regression/KernelRidgeRegression.h b/src/shogun/regression/KernelRidgeRegression.h
@@ -64,6 +64,8 @@ enum ETrainingType
 class CKernelRidgeRegression : public CKernelMachine
 {
 	public:
+		MACHINE_PROBLEM_TYPE(PT_REGRESSION);
+
 		/** default constructor */
 		CKernelRidgeRegression();
 

diff --git a/src/shogun/regression/LeastAngleRegression.h b/src/shogun/regression/LeastAngleRegression.h
@@ -72,6 +72,8 @@ class CFeatures;
 class CLeastAngleRegression: public CLinearMachine
 {
 public:
+	MACHINE_PROBLEM_TYPE(PT_REGRESSION);
+
 	/** default constructor
 	 *
 	 * @param lasso - when true, it runs the LASSO, when false, it runs LARS

diff --git a/src/shogun/regression/LeastSquaresRegression.h b/src/shogun/regression/LeastSquaresRegression.h
@@ -40,6 +40,8 @@ namespace shogun
 class CLeastSquaresRegression : public CLinearRidgeRegression
 {
 	public:
+		MACHINE_PROBLEM_TYPE(PT_REGRESSION);
+
 		/** default constructor */
 		CLeastSquaresRegression();
 

diff --git a/src/shogun/regression/LinearRidgeRegression.h b/src/shogun/regression/LinearRidgeRegression.h
@@ -42,6 +42,8 @@ namespace shogun
 class CLinearRidgeRegression : public CLinearMachine
 {
 	public:
+		MACHINE_PROBLEM_TYPE(PT_REGRESSION);
+
 		/** default constructor */
 		CLinearRidgeRegression();
 

diff --git a/src/shogun/regression/svr/LibSVR.h b/src/shogun/regression/svr/LibSVR.h
@@ -51,6 +51,8 @@ namespace shogun
 class CLibSVR : public CSVM
 {
 	public:
+		MACHINE_PROBLEM_TYPE(PT_REGRESSION);
+
 		/** default constructor */
 		CLibSVR();
 

diff --git a/src/shogun/regression/svr/MKLRegression.h b/src/shogun/regression/svr/MKLRegression.h
@@ -25,6 +25,8 @@ namespace shogun
 class CMKLRegression : public CMKL
 {
 	public:
+		MACHINE_PROBLEM_TYPE(PT_REGRESSION);
+
 		/** Constructor
 		 *
 		 * @param s SVM to use as constraint generator in MKL SILP

diff --git a/src/shogun/regression/svr/SVRLight.h b/src/shogun/regression/svr/SVRLight.h
@@ -62,6 +62,8 @@ namespace shogun
 class CSVRLight: public CSVMLight
 {
 	public:
+		MACHINE_PROBLEM_TYPE(PT_REGRESSION);
+
 		/** default constructor */
 		CSVRLight();