An interface for checking label type

shogun-toolbox · May 22, 2012 · 4d35f91 · 4d35f91
1 parent d204fcd
commit 4d35f91
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 3 deletions.
diff --git a/src/shogun/machine/KernelMachine.h b/src/shogun/machine/KernelMachine.h
@@ -265,7 +265,6 @@ class CKernelMachine : public CMachine
 		/** @return whether machine supports locking */
 		virtual bool supports_locking() const { return true; }
 
-
 	protected:
 
 		SGVector<float64_t> apply_get_outputs(CFeatures* data);

diff --git a/src/shogun/machine/Machine.cpp b/src/shogun/machine/Machine.cpp
@@ -66,6 +66,10 @@ bool CMachine::train(CFeatures* data)
 
 void CMachine::set_labels(CLabels* lab)
 {
+    if (lab != NULL)
+        if (!is_label_valid(lab))
+            SG_ERROR("Invalid label for %s", get_name());
+
 	SG_UNREF(m_labels);
 	SG_REF(lab);
 	m_labels = lab;

diff --git a/src/shogun/machine/Machine.h b/src/shogun/machine/Machine.h
@@ -291,6 +291,17 @@ class CMachine : public CSGObject
 					" work though.\n", get_name());
 		}
 
+        /** check whether the labels is valid.
+         *
+         * Subclasses can override this to implement their check of label types.
+         *
+         * @param lab the labels being checked, guaranteed to be non-NULL
+         */
+        virtual bool is_label_valid(CLabels *lab) const
+        {
+            return true;
+        }
+
 	protected:
 		/** maximum training time */
 		float64_t m_max_train_time;

diff --git a/src/shogun/machine/MulticlassMachine.cpp b/src/shogun/machine/MulticlassMachine.cpp
@@ -52,8 +52,6 @@ CMulticlassMachine::~CMulticlassMachine()
 
 void CMulticlassMachine::set_labels(CLabels* lab)
 {
-    if (lab)
-        ASSERT(lab->get_label_type() == LT_MULTICLASS);
     CMachine::set_labels(lab);
     if (lab)
         init_strategy();

diff --git a/src/shogun/machine/MulticlassMachine.h b/src/shogun/machine/MulticlassMachine.h
@@ -134,6 +134,15 @@ class CMulticlassMachine : public CMachine
             return CT_MULTICLASS;
         }
 
+        /** check whether the labels is valid.
+         *
+         * @param lab the labels being checked, guaranteed to be non-NULL
+         */
+        virtual bool is_label_valid(CLabels *lab) const
+        {
+            return lab->get_label_type() == LT_MULTICLASS;
+        }
+
 	protected:
 		/** init strategy */
 		void init_strategy();