Systematic framework tests for all machines

shogun-toolbox · Jul 10, 2019 · 79d7838 · 79d7838
1 parent 94664d8
commit 79d7838
Show file tree

Hide file tree

Showing 5 changed files with 389 additions and 210 deletions.
diff --git a/src/shogun/machine/BaggingMachine.cpp b/src/shogun/machine/BaggingMachine.cpp
@@ -309,7 +309,7 @@ void CBaggingMachine::init()
 	m_features = NULL;
 	m_combination_rule = NULL;
 	m_labels = NULL;
-	m_num_bags = 0;
+	m_num_bags = 100;
 	m_bag_size = 0;
 	m_all_oob_idx = SGVector<bool>();
 	m_oob_indices = NULL;

diff --git a/src/shogun/machine/Machine.cpp b/src/shogun/machine/Machine.cpp
@@ -37,7 +37,7 @@ bool CMachine::train(CFeatures* data)
 	if (train_require_labels())
 	{
 		if (m_labels == NULL)
-			SG_ERROR("%s@%p: No labels given", get_name(), this)
+			SG_ERROR("No labels provided.\n", get_name())
 
 		m_labels->ensure_valid(get_name());
 	}
@@ -47,7 +47,7 @@ bool CMachine::train(CFeatures* data)
 
 	if (support_feature_dispatching())
 	{
-		REQUIRE(data != NULL, "Features not provided!");
+		REQUIRE(data != NULL, "No features provided.\n");
 		REQUIRE(
 		    data->get_num_vectors() == m_labels->get_num_labels(),
 		    "Number of training vectors (%d) does not match number of "

diff --git a/tests/unit/evaluation/CrossValidation_unittest.cc b/tests/unit/evaluation/CrossValidation_unittest.cc