Merge branch 'multiclass-ecoc' of https://github.com/pluskid/shogun

shogun-toolbox · May 22, 2012 · f318aee · f318aee
2 parents 28082be + 52d53fd
commit f318aee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/shogun/machine/Machine.h b/src/shogun/machine/Machine.h
@@ -77,7 +77,8 @@ enum EMachineType
 	CT_QDA = 430,
 	CT_NEWTONSVM = 440,
 	CT_GAUSSIANPROCESSREGRESSION = 450,
-	CT_LARS = 460
+	CT_LARS = 460,
+	CT_MULTICLASS = 470
 };
 
 /** solver type */

diff --git a/src/shogun/machine/MulticlassMachine.h b/src/shogun/machine/MulticlassMachine.h
@@ -122,6 +122,18 @@ class CMulticlassMachine : public CMachine
 			return "MulticlassMachine";
 		}
 
+		virtual EProblemType get_machine_problem_type() const 
+		{
+			return PT_MULTICLASS;
+		}
+
+		/** get classifier type
+		 */
+		virtual EMachineType get_classifier_type()
+        {
+            return CT_MULTICLASS;
+        }
+
 	protected:
 		/** init strategy */
 		void init_strategy();