From 2ea4b94f25fe38854e324ff387ccd90d73a95fed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Lind-Johansen?= Date: Thu, 13 Apr 2023 08:00:35 +0200 Subject: [PATCH] Some updates related to failing test --- .../test_parameter_filter.py | 19 ++++++++++++++++--- .../_components/parameter_filter.py | 3 ++- .../_settings/_parameter_filter.py | 1 + 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/tests/integration_tests/test_parameter_filter.py b/tests/integration_tests/test_parameter_filter.py index c1e97bf46..23de5d818 100644 --- a/tests/integration_tests/test_parameter_filter.py +++ b/tests/integration_tests/test_parameter_filter.py @@ -4,12 +4,25 @@ def test_dataframe(testdata_folder) -> None: + # pylint: disable=protected-access dframe = pd.read_csv( testdata_folder / "reek_test_data" / "aggregated_data" / "parameters.csv" ) - component = ParameterFilter("test", dframe) - # pylint: disable=protected-access + + expected_discrete_parameters = [ + "FWL", + "MULTFLT_F1", + "INTERPOLATE_WO", + "COHIBA_MODEL_MODE", + "RMS_SEED", + ] + + component = ParameterFilter("test", dframe, include_sens_filter=False) + assert set(component._discrete_parameters) == set(expected_discrete_parameters) + + component = ParameterFilter("test", dframe, include_sens_filter=True) assert set(component._discrete_parameters) == set( - ["FWL", "MULTFLT_F1", "INTERPOLATE_WO", "COHIBA_MODEL_MODE", "RMS_SEED"] + expected_discrete_parameters + ["SENSNAME"] ) + assert component.is_sensitivity_run is True diff --git a/webviz_subsurface/_components/parameter_filter.py b/webviz_subsurface/_components/parameter_filter.py index 65026a2f8..b0f9ee96a 100644 --- a/webviz_subsurface/_components/parameter_filter.py +++ b/webviz_subsurface/_components/parameter_filter.py @@ -30,6 +30,7 @@ def __init__( dframe: pd.DataFrame, reset_on_ensemble_update: bool = False, display_header: bool = True, + include_sens_filter: bool = False, ) -> None: """ * **`uuid`:** Unique id (use the plugin id). @@ -43,7 +44,7 @@ def __init__( drop_constants=True, keep_numeric_only=False, drop_parameters_with_nan=True, - include_sens_filter=True, + include_sens_filter=include_sens_filter, ) self._dframe = self._pmodel.dataframe self._range_parameters = self._get_range_parameters() diff --git a/webviz_subsurface/plugins/_parameter_analysis/_views/_parameter_response_view/_settings/_parameter_filter.py b/webviz_subsurface/plugins/_parameter_analysis/_views/_parameter_response_view/_settings/_parameter_filter.py index 943edd05e..3f2f6935b 100644 --- a/webviz_subsurface/plugins/_parameter_analysis/_views/_parameter_response_view/_settings/_parameter_filter.py +++ b/webviz_subsurface/plugins/_parameter_analysis/_views/_parameter_response_view/_settings/_parameter_filter.py @@ -25,4 +25,5 @@ def layout(self) -> List[Component]: ].copy(), reset_on_ensemble_update=True, display_header=False, + include_sens_filter=True, ).layout