Restored apply_one method of multiclass machine

shogun-toolbox · May 21, 2012 · e496dce · e496dce
1 parent 5f9d58b
commit e496dce
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/shogun/machine/MulticlassMachine.cpp b/src/shogun/machine/MulticlassMachine.cpp
@@ -175,3 +175,18 @@ bool CMulticlassMachine::train_machine(CFeatures* data)
 
 	return true;
 }
+
+float64_t CMulticlassMachine::apply_one(int32_t vec_idx)
+{
+	init_machines_for_apply(NULL);
+
+	ASSERT(m_machines->get_num_elements()>0);
+	SGVector<float64_t> outputs(m_machines->get_num_elements());
+
+	for (int32_t i=0; i<m_machines->get_num_elements(); i++)
+		outputs[i] = get_submachine_output(i, vec_idx);
+
+	float64_t result = m_multiclass_strategy->decide_label(outputs);
+
+	return result;
+}
diff --git a/src/shogun/machine/MulticlassMachine.h b/src/shogun/machine/MulticlassMachine.h
@@ -100,6 +100,12 @@ class CMulticlassMachine : public CMachine
 		 */
 		virtual CMulticlassLabels* apply_multiclass(CFeatures* data=NULL);
 
+		/** classify one example
+		 * @param vec_idx
+		 * @return label
+		 */
+		virtual float64_t apply_one(int32_t vec_idx);
+
 		/** get the type of multiclass'ness
 		 *
 		 * @return multiclass type one vs one etc