Finally proper rejects handling

shogun-toolbox · Mar 10, 2012 · eee5670 · eee5670
1 parent d123ca6
commit eee5670
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/shogun/evaluation/MulticlassAccuracy.cpp b/src/shogun/evaluation/MulticlassAccuracy.cpp
@@ -19,7 +19,7 @@ float64_t CMulticlassAccuracy::evaluate(CLabels* predicted, CLabels* ground_trut
 	ASSERT(predicted->get_num_labels() == ground_truth->get_num_labels());
 	int32_t length = predicted->get_num_labels();
 	int32_t correct = 0;
-	if (!m_ignore_rejects)
+	if (m_ignore_rejects)
 	{
 		for (int32_t i=0; i<length; i++)
 		{
@@ -37,11 +37,11 @@ float64_t CMulticlassAccuracy::evaluate(CLabels* predicted, CLabels* ground_trut
 
 			if (predicted_label==predicted->REJECTION_LABEL)
 				total--;
-			else
+			else if (predicted_label==ground_truth->get_int_label(i))
 				correct++;
-
-			return ((float64_t)correct)/total;
 		}
+		SG_DEBUG("correct=%d, total=%d, rejected=%d\n",correct,total,length-total);
+		return ((float64_t)correct)/total;
 	}
 	return 0.0;
 }

diff --git a/src/shogun/machine/MulticlassMachine.cpp b/src/shogun/machine/MulticlassMachine.cpp
@@ -151,10 +151,9 @@ CLabels* CMulticlassMachine::classify_one_vs_rest()
 			for (int32_t j=0; j<num_machines; j++)
 				outputs_for_i[j] = outputs[j]->get_label(i);
 
-			if (m_rejection_strategy)
+			if (m_rejection_strategy && rejection_strategy->reject(outputs_for_i))
 			{
-				if (m_rejection_strategy->reject(outputs_for_i))
-					winner=result->REJECTION_LABEL;
+				winner=result->REJECTION_LABEL;
 			}
 			else
 			{