From ae5214802105342c1a8ec012d1b0b85ecd54a778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Monta=C3=B1ana?= Date: Sun, 8 Jan 2023 12:25:59 +0100 Subject: [PATCH] Remove ignore-nan from .env files leave only as be_main hyperparameter --- benchmark/Arguments.py | 6 +++--- benchmark/Models.py | 5 +++++ benchmark/tests/.env | 3 +-- benchmark/tests/.env.arff | 3 +-- benchmark/tests/.env.dist | 3 +-- benchmark/tests/.env.surcov | 3 +-- benchmark/tests/Util_test.py | 9 --------- 7 files changed, 12 insertions(+), 20 deletions(-) diff --git a/benchmark/Arguments.py b/benchmark/Arguments.py index f655dd0..1ffd623 100644 --- a/benchmark/Arguments.py +++ b/benchmark/Arguments.py @@ -126,9 +126,9 @@ class Arguments(argparse.ArgumentParser): "ignore_nan": [ ("--ignore-nan",), { - "action": EnvDefault, - "envvar": "ignore_nan", - "required": True, + "default": False, + "action": "store_true", + "required": False, "help": "Ignore nan results", }, ], diff --git a/benchmark/Models.py b/benchmark/Models.py index 8c03ae1..bf1ace1 100644 --- a/benchmark/Models.py +++ b/benchmark/Models.py @@ -28,6 +28,11 @@ class MockModel(SVC): def nodes_leaves(self): return 0, 0 + def fit(self, X, y, **kwargs): + kwargs.pop("state_names", None) + kwargs.pop("features", None) + return super().fit(X, y, **kwargs) + class Models: @staticmethod diff --git a/benchmark/tests/.env b/benchmark/tests/.env index 82e6f71..f554eaf 100644 --- a/benchmark/tests/.env +++ b/benchmark/tests/.env @@ -6,5 +6,4 @@ stratified=0 # Source of data Tanveer/Surcov source_data=Tanveer seeds=[57, 31, 1714, 17, 23, 79, 83, 97, 7, 1] -discretize=0 -ignore_nan=0 \ No newline at end of file +discretize=0 \ No newline at end of file diff --git a/benchmark/tests/.env.arff b/benchmark/tests/.env.arff index 65ea052..7f196d9 100644 --- a/benchmark/tests/.env.arff +++ b/benchmark/tests/.env.arff @@ -5,5 +5,4 @@ model=ODTE stratified=0 source_data=Arff seeds=[271, 314, 171] -discretize=1 -ignore_nan=1 \ No newline at end of file +discretize=1 \ No newline at end of file diff --git a/benchmark/tests/.env.dist b/benchmark/tests/.env.dist index 82e6f71..f554eaf 100644 --- a/benchmark/tests/.env.dist +++ b/benchmark/tests/.env.dist @@ -6,5 +6,4 @@ stratified=0 # Source of data Tanveer/Surcov source_data=Tanveer seeds=[57, 31, 1714, 17, 23, 79, 83, 97, 7, 1] -discretize=0 -ignore_nan=0 \ No newline at end of file +discretize=0 \ No newline at end of file diff --git a/benchmark/tests/.env.surcov b/benchmark/tests/.env.surcov index 600a83b..805ec7b 100644 --- a/benchmark/tests/.env.surcov +++ b/benchmark/tests/.env.surcov @@ -6,5 +6,4 @@ stratified=0 # Source of data Tanveer/Surcov source_data=Surcov seeds=[57, 31, 1714, 17, 23, 79, 83, 97, 7, 1] -discretize=0 -ignore_nan=0 \ No newline at end of file +discretize=0 \ No newline at end of file diff --git a/benchmark/tests/Util_test.py b/benchmark/tests/Util_test.py index ad291fa..8ca7b33 100644 --- a/benchmark/tests/Util_test.py +++ b/benchmark/tests/Util_test.py @@ -180,7 +180,6 @@ class UtilTest(TestBase): "source_data": "Tanveer", "seeds": "[57, 31, 1714, 17, 23, 79, 83, 97, 7, 1]", "discretize": "0", - "ignore_nan": "0", } computed = EnvData().load() self.assertDictEqual(computed, expected) @@ -192,16 +191,8 @@ class UtilTest(TestBase): "n_folds": 5, "model": "STree", "stratified": "0", - "ignore_nan": "0", } ap = argparse.ArgumentParser() - ap.add_argument( - "--ignore-nan", - action=EnvDefault, - envvar="ignore_nan", - required=True, - help="Ignore nan results", - ) ap.add_argument( "-s", "--score",