fixes for repeated validation (#223)

mljar · Dec 8, 2020 · d316477 · d316477
1 parent 115e773
commit d316477
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/supervised/utils/learning_curves.py b/supervised/utils/learning_curves.py
@@ -112,7 +112,12 @@ def plot_iterations(
         else:
             plt.xlabel("#Iteration")
         plt.ylabel(metric_name)
-        plt.legend(loc="best")
+
+        # limit number of learners in the legend
+        # too many will raise warnings
+        if len(learner_names) <= 15:
+            plt.legend(loc="best")
+
         plt.tight_layout(pad=2.0)
         plot_path = os.path.join(model_path, LearningCurves.output_file_name)
         plt.savefig(plot_path)

diff --git a/supervised/validation/validator_kfold.py b/supervised/validation/validator_kfold.py
@@ -25,7 +25,7 @@ def __init__(self, params):
         self.shuffle = self.params.get("shuffle", True)
         self.stratify = self.params.get("stratify", False)
         self.random_seed = self.params.get("random_seed", 1906)
-        self.repeats = self.params.get("repeat", 1)
+        self.repeats = self.params.get("repeats", 1)
 
         if not self.shuffle and self.repeats > 1:
             warnings.warn("Disable repeats in validation because shuffle is disabled")

diff --git a/supervised/validation/validator_split.py b/supervised/validation/validator_split.py
@@ -23,7 +23,7 @@ def __init__(self, params):
         self.shuffle = self.params.get("shuffle", True)
         self.stratify = self.params.get("stratify", False)
         self.random_seed = self.params.get("random_seed", 1234)
-        self.repeats = self.params.get("repeat", 1)
+        self.repeats = self.params.get("repeats", 1)
 
         if not self.shuffle and self.repeats > 1:
             warnings.warn("Disable repeats in validation because shuffle is disabled")

diff --git a/tests/tests_validation/test_validator_kfold.py b/tests/tests_validation/test_validator_kfold.py
@@ -154,7 +154,7 @@ def test_repeats(self):
             "shuffle": True,
             "stratify": False,
             "k_folds": 2,
-            "repeat": 10,
+            "repeats": 10,
             "results_path": self._results_path,
             "X_path": X_path,
             "y_path": y_path,
@@ -163,7 +163,7 @@ def test_repeats(self):
         vl = KFoldValidator(params)
 
         self.assertEqual(params["k_folds"], vl.get_n_splits())
-        self.assertEqual(params["repeat"], vl.get_repeats())
+        self.assertEqual(params["repeats"], vl.get_repeats())
 
         for repeat in range(vl.get_repeats()):
             for k_fold in range(vl.get_n_splits()):
@@ -199,7 +199,7 @@ def test_disable_repeats_when_disabled_shuffle(self):
             "shuffle": False,
             "stratify": False,
             "k_folds": 2,
-            "repeat": 10,
+            "repeats": 10,
             "results_path": self._results_path,
             "X_path": X_path,
             "y_path": y_path,

diff --git a/tests/tests_validation/test_validator_split.py b/tests/tests_validation/test_validator_split.py
@@ -160,7 +160,7 @@ def test_repeats(self):
             "results_path": self._results_path,
             "X_path": X_path,
             "y_path": y_path,
-            "repeat": 3
+            "repeats": 3
         }
         vl = SplitValidator(params)
 
@@ -209,7 +209,7 @@ def test_disable_repeats_when_disabled_shuffle(self):
             "results_path": self._results_path,
             "X_path": X_path,
             "y_path": y_path,
-            "repeat": 3
+            "repeats": 3
         }
         vl = SplitValidator(params)