Renamed LT_REAL to LT_REGRESSIONw

shogun-toolbox · May 21, 2012 · 4b44437 · 4b44437
1 parent 17f015e
commit 4b44437
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/src/shogun/evaluation/MeanAbsoluteError.cpp b/src/shogun/evaluation/MeanAbsoluteError.cpp
@@ -16,8 +16,8 @@ using namespace shogun;
 
 float64_t CMeanAbsoluteError::evaluate(CLabels* predicted, CLabels* ground_truth)
 {
-	ASSERT(predicted && predicted->get_label_type() == LT_REAL);
-	ASSERT(ground_truth && ground_truth->get_label_type() == LT_REAL);
+	ASSERT(predicted && predicted->get_label_type() == LT_REGRESSION);
+	ASSERT(ground_truth && ground_truth->get_label_type() == LT_REGRESSION);
 
 	ASSERT(predicted->get_num_labels() == ground_truth->get_num_labels());
 	int32_t length = predicted->get_num_labels();

diff --git a/src/shogun/evaluation/MeanSquaredError.cpp b/src/shogun/evaluation/MeanSquaredError.cpp
@@ -19,8 +19,8 @@ float64_t CMeanSquaredError::evaluate(CLabels* predicted, CLabels* ground_truth)
 {
 	ASSERT(predicted && ground_truth);
 	ASSERT(predicted->get_num_labels() == ground_truth->get_num_labels());
-	ASSERT(predicted->get_label_type() == LT_REAL);
-	ASSERT(ground_truth->get_label_type() == LT_REAL);
+	ASSERT(predicted->get_label_type() == LT_REGRESSION);
+	ASSERT(ground_truth->get_label_type() == LT_REGRESSION);
 	int32_t length = predicted->get_num_labels();
 	float64_t mse = 0.0;
 	for (int32_t i=0; i<length; i++)

diff --git a/src/shogun/evaluation/MeanSquaredLogError.cpp b/src/shogun/evaluation/MeanSquaredLogError.cpp
@@ -19,8 +19,8 @@ float64_t CMeanSquaredLogError::evaluate(CLabels* predicted, CLabels* ground_tru
 {
 	ASSERT(predicted && ground_truth);
 	ASSERT(predicted->get_num_labels()==ground_truth->get_num_labels());
-	ASSERT(predicted->get_label_type()==LT_REAL);
-	ASSERT(ground_truth->get_label_type()==LT_REAL);
+	ASSERT(predicted->get_label_type()==LT_REGRESSION);
+	ASSERT(ground_truth->get_label_type()==LT_REGRESSION);
 
 	int32_t length=predicted->get_num_labels();
 	float64_t msle=0.0;

diff --git a/src/shogun/labels/LabelTypes.h b/src/shogun/labels/LabelTypes.h
@@ -15,6 +15,6 @@ enum ELabelType
 	/// multi-class labels 0,1,...
 	LT_MULTICLASS = 1,
 	/// real valued labels (e.g. for regression, classifier outputs)
-	LT_REAL = 3
+	LT_REGRESSION = 3
 };
 #endif
diff --git a/src/shogun/labels/Labels.h b/src/shogun/labels/Labels.h
@@ -59,7 +59,7 @@ class CLabels : public CSGObject
 		 * @return label type (binary, multiclass, ...)
 		 */
 		//virtual ELabelType get_label_type()=0;
-		virtual ELabelType get_label_type() { return LT_REAL; }
+		virtual ELabelType get_label_type() { return LT_REGRESSION; }
 
 		/** adds a subset of indices on top of the current subsets (possibly
 		 * subset of subset. Calls subset_changed_post() afterwards

diff --git a/src/shogun/labels/RegressionLabels.cpp b/src/shogun/labels/RegressionLabels.cpp
@@ -22,7 +22,7 @@ CRegressionLabels::CRegressionLabels(CFile* loader) : CDenseLabels(loader)
 
 CRegressionLabels* CRegressionLabels::obtain_from_generic(CLabels* base_labels)
 {
-	if ( base_labels->get_label_type() == LT_REAL )
+	if ( base_labels->get_label_type() == LT_REGRESSION )
 		return (CRegressionLabels*) base_labels;
 	else
 		SG_SERROR("base_labels must be of dynamic type CRegressionLabels");
@@ -38,6 +38,6 @@ bool CRegressionLabels::is_valid()
 
 ELabelType CRegressionLabels::get_label_type()
 {
-	return LT_REAL;
+	return LT_REGRESSION;
 }
 
diff --git a/src/shogun/regression/KernelRidgeRegression.cpp b/src/shogun/regression/KernelRidgeRegression.cpp
@@ -128,7 +128,7 @@ bool CKernelRidgeRegression::train_machine(CFeatures *data)
 	if (!m_labels)
 		SG_ERROR("No labels set\n");
 
-	if (m_labels->get_label_type() != LT_REAL)
+	if (m_labels->get_label_type() != LT_REGRESSION)
 		SG_ERROR("Real labels needed for kernel ridge regression.\n");
 
 	if (data)

diff --git a/src/shogun/regression/LeastAngleRegression.cpp b/src/shogun/regression/LeastAngleRegression.cpp
@@ -92,7 +92,7 @@ bool CLeastAngleRegression::train_machine(CFeatures* data)
 {
 	if (!m_labels)
 		SG_ERROR("No labels set\n");
-	if (m_labels->get_label_type() != LT_REAL)
+	if (m_labels->get_label_type() != LT_REGRESSION)
 		SG_ERROR("Expected RegressionLabels\n");
 
 	if (!data)

diff --git a/src/shogun/regression/svr/LibSVR.cpp b/src/shogun/regression/svr/LibSVR.cpp
@@ -45,7 +45,7 @@ bool CLibSVR::train_machine(CFeatures* data)
 {
 	ASSERT(kernel);
 	ASSERT(m_labels && m_labels->get_num_labels());
-	ASSERT(m_labels->get_label_type() == LT_REAL);
+	ASSERT(m_labels->get_label_type() == LT_REGRESSION);
 
 	if (data)
 	{