Added ensure_valid to ROC, PRC and ContingencyTableEvaluation

shogun-toolbox · May 22, 2012 · c196b13 · c196b13
1 parent c3b256b
commit c196b13
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/src/shogun/evaluation/ContingencyTableEvaluation.cpp b/src/shogun/evaluation/ContingencyTableEvaluation.cpp
@@ -17,6 +17,8 @@ float64_t CContingencyTableEvaluation::evaluate(CLabels* predicted, CLabels* gro
 {
 	ASSERT(predicted->get_label_type()==LT_BINARY);
 	ASSERT(ground_truth->get_label_type()==LT_BINARY);
+	predicted->ensure_valid();
+	ground_truth->ensure_valid();
 	compute_scores((CBinaryLabels*)predicted,(CBinaryLabels*)ground_truth);
 	switch (m_type)
 	{

diff --git a/src/shogun/evaluation/PRCEvaluation.cpp b/src/shogun/evaluation/PRCEvaluation.cpp
@@ -25,6 +25,7 @@ float64_t CPRCEvaluation::evaluate(CLabels* predicted, CLabels* ground_truth)
 	ASSERT(predicted->get_num_labels()==ground_truth->get_num_labels());
 	ASSERT(predicted->get_label_type()==LT_BINARY);
 	ASSERT(ground_truth->get_label_type()==LT_BINARY);
+	ground_truth->ensure_valid();
 
 	// number of true positive examples
 	float64_t tp = 0.0;

diff --git a/src/shogun/evaluation/ROCEvaluation.cpp b/src/shogun/evaluation/ROCEvaluation.cpp
@@ -23,6 +23,7 @@ float64_t CROCEvaluation::evaluate(CLabels* predicted, CLabels* ground_truth)
 	ASSERT(predicted->get_num_labels()==ground_truth->get_num_labels());
 	ASSERT(predicted->get_label_type()==LT_BINARY);
 	ASSERT(ground_truth->get_label_type()==LT_BINARY);
+	ground_truth->ensure_valid();
 
 	// assume threshold as negative infinity
 	float64_t threshold = CMath::ALMOST_NEG_INFTY;