+ obtain from generic Labels in sub-label classes

shogun-toolbox · May 21, 2012 · 4562bc0 · 4562bc0
1 parent 89a638e
commit 4562bc0
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 2 deletions.
diff --git a/src/shogun/labels/BinaryLabels.cpp b/src/shogun/labels/BinaryLabels.cpp
@@ -27,6 +27,17 @@ CBinaryLabels::CBinaryLabels(CFile* loader) : CDenseLabels(loader),
 {
 }
 
+CBinaryLabels* CBinaryLabels::obtain_from_generic(CLabels* base_labels)
+{
+	if ( base_labels->get_label_type() == LT_BINARY )
+		return (CBinaryLabels*) base_labels;
+	else
+		SG_ERROR("base_labels must be of dynamic type CBinaryLabels");
+
+	return NULL;
+}
+
+
 bool CBinaryLabels::is_valid()
 {       
     ASSERT(m_labels.vector);

diff --git a/src/shogun/labels/BinaryLabels.h b/src/shogun/labels/BinaryLabels.h
@@ -51,6 +51,12 @@ class CBinaryLabels : public CDenseLabels
 		 */
 		CBinaryLabels(CFile* loader);
 
+		/** helper method used to specialize a base class instance
+		 *
+		 * @param base_labels its dynamic type must be CBinaryLabels
+		 */
+		CBinaryLabels* obtain_from_generic(CLabels* base_labels);
+
 		/** is_valid checks if labeling is a two-class labeling
 		 *
 		 * possible with subset

diff --git a/src/shogun/labels/MulticlassLabels.cpp b/src/shogun/labels/MulticlassLabels.cpp
@@ -27,6 +27,8 @@ CMulticlassLabels* CMulticlassLabels::obtain_from_generic(CLabels* base_labels)
 		return (CMulticlassLabels*) base_labels;
 	else
 		SG_ERROR("base_labels must be of dynamic type CMulticlassLabels");
+
+	return NULL;
 }
 
 bool CMulticlassLabels::is_valid()

diff --git a/src/shogun/labels/MulticlassLabels.h b/src/shogun/labels/MulticlassLabels.h
@@ -54,7 +54,7 @@ class CMulticlassLabels : public CDenseLabels
 		 */
 		CMulticlassLabels(CFile* loader);
 
-		/** helper method used to specialize a base class instance 
+		/** helper method used to specialize a base class instance
 		 *
 		 * @param base_labels its dynamic type must be CMulticlassLabels
 		 */

diff --git a/src/shogun/labels/RealLabels.cpp b/src/shogun/labels/RealLabels.cpp
@@ -20,6 +20,16 @@ CRealLabels::CRealLabels(CFile* loader) : CDenseLabels(loader)
 {
 }
 
+CRealLabels* CRealLabels::obtain_from_generic(CLabels* base_labels)
+{
+	if ( base_labels->get_label_type() == LT_REAL )
+		return (CRealLabels*) base_labels;
+	else
+		SG_ERROR("base_labels must be of dynamic type CRealLabels");
+
+	return NULL;
+}
+
 bool CRealLabels::is_valid()
 {       
 	ASSERT(m_labels.vector);

diff --git a/src/shogun/labels/RealLabels.h b/src/shogun/labels/RealLabels.h
@@ -55,6 +55,12 @@ class CRealLabels : public CDenseLabels
 		 */
 		CRealLabels(CFile* loader);
 
+		/** helper method used to specialize a base class instance
+		 *
+		 * @param base_labels its dynamic type must be CRealLabels
+		 */
+		CRealLabels* obtain_from_generic(CLabels* base_labels);
+
 		/** is_valid checks if labeling is a multi-class labeling
 		 *
 		 * possible with subset
@@ -65,7 +71,7 @@ class CRealLabels : public CDenseLabels
 
 		/** get label type
 		 *
-		 * @return label type multiclass
+		 * @return label type real
 		 */
 		virtual ELabelType get_label_type();
 };