Skip to content

Commit a91b17f

Browse files
jonathan-eqjonathan-eq
committed
fixup
1 parent 3123a1c commit a91b17f

File tree

7 files changed

+73
-42
lines changed

7 files changed

+73
-42
lines changed

‎src/ert/config/design_matrix.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ def __post_init__(self) -> None:
4444
def from_config_list(cls, config_list: list[str]) -> DesignMatrix:
4545
filename = Path(config_list[0])
4646
options = option_dict(config_list, 1)
47-
design_sheet = options.get("DESIGN_SHEET", "DesignSheet01")
48-
default_sheet = options.get("DEFAULT_SHEET", "DefaultValues")
47+
design_sheet = options.get("DESIGN_SHEET", "DesignSheet")
48+
default_sheet = options.get("DEFAULT_SHEET", "DefaultSheet")
4949
errors = []
5050
if filename.suffix not in {
5151
".xlsx",

‎tests/ert/ui_tests/cli/analysis/test_design_matrix.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222

2323
def _create_design_matrix(filename, design_sheet_df, default_sheet_df=None):
2424
with pd.ExcelWriter(filename) as xl_write:
25-
design_sheet_df.to_excel(xl_write, index=False, sheet_name="DesignSheet01")
25+
design_sheet_df.to_excel(xl_write, index=False, sheet_name="DesignSheet")
2626
if default_sheet_df is not None:
2727
default_sheet_df.to_excel(
28-
xl_write, index=False, sheet_name="DefaultValues", header=False
28+
xl_write, index=False, sheet_name="DefaultSheet", header=False
2929
)
3030

3131

@@ -54,7 +54,7 @@ def test_run_poly_example_with_design_matrix():
5454
NUM_REALIZATIONS 10
5555
MIN_REALIZATIONS 1
5656
GEN_DATA POLY_RES RESULT_FILE:poly.out
57-
DESIGN_MATRIX poly_design.xlsx DESIGN_SHEET:DesignSheet01 DEFAULT_SHEET:DefaultValues
57+
DESIGN_MATRIX poly_design.xlsx DESIGN_SHEET:DesignSheet DEFAULT_SHEET:DefaultSheet
5858
INSTALL_JOB poly_eval POLY_EVAL
5959
FORWARD_MODEL poly_eval
6060
"""
@@ -156,7 +156,7 @@ def test_run_poly_example_with_design_matrix_and_genkw_merge(default_values, err
156156
MIN_REALIZATIONS 1
157157
GEN_DATA POLY_RES RESULT_FILE:poly.out
158158
GEN_KW COEFFS my_template my_output coeff_priors
159-
DESIGN_MATRIX poly_design.xlsx DESIGN_SHEET:DesignSheet01 DEFAULT_SHEET:DefaultValues
159+
DESIGN_MATRIX poly_design.xlsx DESIGN_SHEET:DesignSheet DEFAULT_SHEET:DefaultSheet
160160
INSTALL_JOB poly_eval POLY_EVAL
161161
FORWARD_MODEL poly_eval
162162
"""
@@ -268,8 +268,8 @@ def test_run_poly_example_with_multiple_design_matrix_instances():
268268
NUM_REALIZATIONS 10
269269
MIN_REALIZATIONS 1
270270
GEN_DATA POLY_RES RESULT_FILE:poly.out
271-
DESIGN_MATRIX poly_design_1.xlsx DESIGN_SHEET:DesignSheet01 DEFAULT_SHEET:DefaultValues
272-
DESIGN_MATRIX poly_design_2.xlsx DESIGN_SHEET:DesignSheet01 DEFAULT_SHEET:DefaultValues
271+
DESIGN_MATRIX poly_design_1.xlsx DESIGN_SHEET:DesignSheet DEFAULT_SHEET:DefaultSheet
272+
DESIGN_MATRIX poly_design_2.xlsx DESIGN_SHEET:DesignSheet DEFAULT_SHEET:DefaultSheet
273273
INSTALL_JOB poly_eval POLY_EVAL
274274
FORWARD_MODEL poly_eval
275275
"""
@@ -358,7 +358,7 @@ def test_design_matrix_on_esmda(experiment_mode, ensemble_name, iterations):
358358
GEN_KW COEFFS_B coeff_priors_b
359359
GEN_KW COEFFS_C coeff_priors_c
360360
GEN_DATA POLY_RES RESULT_FILE:poly.out
361-
DESIGN_MATRIX design_matrix.xlsx DESIGN_SHEET:DesignSheet01 DEFAULT_SHEET:DefaultValues
361+
DESIGN_MATRIX design_matrix.xlsx DESIGN_SHEET:DesignSheet DEFAULT_SHEET:DefaultSheet
362362
INSTALL_JOB poly_eval POLY_EVAL
363363
FORWARD_MODEL poly_eval
364364
"""

‎tests/ert/unit_tests/config/test_analysis_config.py

+33-2
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def test_design_matrix_with_unknown_argument_uses_default(tmp_path, monkeypatch)
133133
}
134134
)
135135
default_sheet_df = pd.DataFrame([["a", 1], ["b", 4]])
136-
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet01")
136+
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet")
137137
default_sheet_df.to_excel(
138138
xl_write, index=False, sheet_name="my_default_sheet", header=False
139139
)
@@ -150,10 +150,41 @@ def test_design_matrix_with_unknown_argument_uses_default(tmp_path, monkeypatch)
150150
],
151151
}
152152
).design_matrix.design_sheet
153-
== "DesignSheet01"
153+
== "DesignSheet"
154154
)
155155

156156

157+
def test_design_matrix_with_too_many_arguments_fails(tmp_path, monkeypatch):
158+
monkeypatch.chdir(tmp_path)
159+
with pd.ExcelWriter("my_design_matrix.xlsx") as xl_write:
160+
design_matrix_df = pd.DataFrame(
161+
{
162+
"REAL": [0, 1, 2],
163+
"a": [1, 2, 3],
164+
"b": [0, 2, 0],
165+
}
166+
)
167+
default_sheet_df = pd.DataFrame([["a", 1], ["b", 4]])
168+
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet")
169+
default_sheet_df.to_excel(
170+
xl_write, index=False, sheet_name="my_default_sheet", header=False
171+
)
172+
with pytest.raises(ConfigValidationError, match="Invalid argument 'too_many'"):
173+
AnalysisConfig.from_dict(
174+
{
175+
ConfigKeys.NUM_REALIZATIONS: 3,
176+
ConfigKeys.DESIGN_MATRIX: [
177+
[
178+
os.path.abspath("my_design_matrix.xlsx"),
179+
"too_many",
180+
"positional_arguments",
181+
"DEFAULT_SHEET:my_default_sheet",
182+
]
183+
],
184+
}
185+
)
186+
187+
157188
def test_invalid_min_realization_percentage_raises_config_validation_error():
158189
with pytest.raises(
159190
ConfigValidationError,

‎tests/ert/unit_tests/config/test_ert_config.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2013,5 +2013,5 @@ def test_design_matrix_default_argument(tmp_path):
20132013
f"NUM_REALIZATIONS 1\nDESIGN_MATRIX {design_matrix_file}"
20142014
)
20152015
assert config.analysis_config.design_matrix
2016-
assert config.analysis_config.design_matrix.design_sheet == "DesignSheet01"
2017-
assert config.analysis_config.design_matrix.default_sheet == "DefaultValues"
2016+
assert config.analysis_config.design_matrix.design_sheet == "DesignSheet"
2017+
assert config.analysis_config.design_matrix.default_sheet == "DefaultSheet"

‎tests/ert/unit_tests/gui/simulation/test_run_dialog.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ def test_that_design_matrix_show_parameters_button_is_visible(
681681
)
682682
default_sheet_df = pd.DataFrame([["b", 1], ["c", 2]])
683683
with pd.ExcelWriter(xls_filename) as xl_write:
684-
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet01")
684+
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet")
685685
default_sheet_df.to_excel(
686686
xl_write, index=False, sheet_name="DefaultSheet", header=False
687687
)
@@ -691,7 +691,7 @@ def test_that_design_matrix_show_parameters_button_is_visible(
691691
f.write("NUM_REALIZATIONS 1")
692692
if design_matrix_entry:
693693
f.write(
694-
f"\nDESIGN_MATRIX {xls_filename} DESIGN_SHEET:DesignSheet01 DEFAULT_SHEET:DefaultSheet"
694+
f"\nDESIGN_MATRIX {xls_filename} DESIGN_SHEET:DesignSheet DEFAULT_SHEET:DefaultSheet"
695695
)
696696

697697
args_mock = Mock()

‎tests/ert/unit_tests/sensitivity_analysis/test_design_matrix.py

+24-24
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
def _create_design_matrix(xls_path, design_matrix_df, default_sheet_df) -> DesignMatrix:
1414
with pd.ExcelWriter(xls_path) as xl_write:
15-
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet01")
15+
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet")
1616
default_sheet_df.to_excel(
17-
xl_write, index=False, sheet_name="DefaultValues", header=False
17+
xl_write, index=False, sheet_name="DefaultSheet", header=False
1818
)
19-
return DesignMatrix(xls_path, "DesignSheet01", "DefaultValues")
19+
return DesignMatrix(xls_path, "DesignSheet", "DefaultSheet")
2020

2121

2222
@pytest.mark.parametrize(
@@ -145,11 +145,11 @@ def test_read_and_merge_with_existing_parameters(tmp_path, parameters, error_msg
145145
)
146146
default_sheet_df = pd.DataFrame([["a", 1], ["b", 4]])
147147
with pd.ExcelWriter(design_path) as xl_write:
148-
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet01")
148+
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet")
149149
default_sheet_df.to_excel(
150-
xl_write, index=False, sheet_name="DefaultValues", header=False
150+
xl_write, index=False, sheet_name="DefaultSheet", header=False
151151
)
152-
design_matrix = DesignMatrix(design_path, "DesignSheet01", "DefaultValues")
152+
design_matrix = DesignMatrix(design_path, "DesignSheet", "DefaultSheet")
153153
if error_msg:
154154
with pytest.raises(ValueError, match=error_msg):
155155
design_matrix.merge_with_existing_parameters(extra_genkw_config)
@@ -180,11 +180,11 @@ def test_reading_design_matrix(tmp_path):
180180
)
181181
default_sheet_df = pd.DataFrame([["one", 1], ["b", 4], ["d", "case_name"]])
182182
with pd.ExcelWriter(design_path) as xl_write:
183-
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet01")
183+
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet")
184184
default_sheet_df.to_excel(
185-
xl_write, index=False, sheet_name="DefaultValues", header=False
185+
xl_write, index=False, sheet_name="DefaultSheet", header=False
186186
)
187-
design_matrix = DesignMatrix(design_path, "DesignSheet01", "DefaultValues")
187+
design_matrix = DesignMatrix(design_path, "DesignSheet", "DefaultSheet")
188188
design_params = design_matrix.parameter_configuration
189189
assert all(param in design_params for param in ("a", "b", "c", "one", "d"))
190190
assert design_matrix.active_realizations == [True, True, False, False, True]
@@ -218,13 +218,13 @@ def test_reading_design_matrix_validate_reals(tmp_path, real_column, error_msg):
218218
)
219219
default_sheet_df = pd.DataFrame()
220220
with pd.ExcelWriter(design_path) as xl_write:
221-
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet01")
221+
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet")
222222
default_sheet_df.to_excel(
223-
xl_write, index=False, sheet_name="DefaultValues", header=False
223+
xl_write, index=False, sheet_name="DefaultSheet", header=False
224224
)
225225

226226
with pytest.raises(ValueError, match=error_msg):
227-
DesignMatrix(design_path, "DesignSheet01", "DefaultValues")
227+
DesignMatrix(design_path, "DesignSheet", "DefaultSheet")
228228

229229

230230
@pytest.mark.parametrize(
@@ -270,13 +270,13 @@ def test_reading_design_matrix_validate_headers(tmp_path, column_names, error_ms
270270
)
271271
default_sheet_df = pd.DataFrame([["one", 1], ["b", 4], ["d", 6]])
272272
with pd.ExcelWriter(design_path) as xl_write:
273-
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet01")
273+
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet")
274274
default_sheet_df.to_excel(
275-
xl_write, index=False, sheet_name="DefaultValues", header=False
275+
xl_write, index=False, sheet_name="DefaultSheet", header=False
276276
)
277277

278278
with pytest.raises(ValueError, match=error_msg):
279-
DesignMatrix(design_path, "DesignSheet01", "DefaultValues")
279+
DesignMatrix(design_path, "DesignSheet", "DefaultSheet")
280280

281281

282282
@pytest.mark.parametrize(
@@ -306,13 +306,13 @@ def test_reading_design_matrix_validate_cells(tmp_path, values, error_msg):
306306
)
307307
default_sheet_df = pd.DataFrame()
308308
with pd.ExcelWriter(design_path) as xl_write:
309-
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet01")
309+
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet")
310310
default_sheet_df.to_excel(
311-
xl_write, index=False, sheet_name="DefaultValues", header=False
311+
xl_write, index=False, sheet_name="DefaultSheet", header=False
312312
)
313313

314314
with pytest.raises(ValueError, match=error_msg):
315-
DesignMatrix(design_path, "DesignSheet01", "DefaultValues")
315+
DesignMatrix(design_path, "DesignSheet", "DefaultSheet")
316316

317317

318318
@pytest.mark.parametrize(
@@ -352,13 +352,13 @@ def test_reading_default_sheet_validation(tmp_path, data, error_msg):
352352
)
353353
default_sheet_df = pd.DataFrame(data)
354354
with pd.ExcelWriter(design_path) as xl_write:
355-
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet01")
355+
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet")
356356
default_sheet_df.to_excel(
357-
xl_write, index=False, sheet_name="DefaultValues", header=False
357+
xl_write, index=False, sheet_name="DefaultSheet", header=False
358358
)
359359

360360
with pytest.raises(ValueError, match=error_msg):
361-
DesignMatrix(design_path, "DesignSheet01", "DefaultValues")
361+
DesignMatrix(design_path, "DesignSheet", "DefaultSheet")
362362

363363

364364
def test_default_values_used(tmp_path):
@@ -373,11 +373,11 @@ def test_default_values_used(tmp_path):
373373
)
374374
default_sheet_df = pd.DataFrame([["one", 1], ["b", 4], ["d", "case_name"]])
375375
with pd.ExcelWriter(design_path) as xl_write:
376-
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet01")
376+
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet")
377377
default_sheet_df.to_excel(
378-
xl_write, index=False, sheet_name="DefaultValues", header=False
378+
xl_write, index=False, sheet_name="DefaultSheet", header=False
379379
)
380-
design_matrix = DesignMatrix(design_path, "DesignSheet01", "DefaultValues")
380+
design_matrix = DesignMatrix(design_path, "DesignSheet", "DefaultSheet")
381381
df = design_matrix.design_matrix_df
382382
np.testing.assert_equal(df["one"], np.array([1, 1, 1, 1]))
383383
np.testing.assert_equal(df["b"], np.array([0, 2, 0, 1]))

‎tests/ert/unit_tests/test_libres_facade.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,11 @@ def test_save_parameters_to_storage_from_design_dataframe(
276276
c_values = np.random.default_rng().uniform(-5, 5, 10)
277277
design_matrix_df = DataFrame({"a": a_values, "b": b_values, "c": c_values})
278278
with ExcelWriter(design_path) as xl_write:
279-
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet01")
279+
design_matrix_df.to_excel(xl_write, index=False, sheet_name="DesignSheet")
280280
DataFrame().to_excel(
281-
xl_write, index=False, sheet_name="DefaultValues", header=False
281+
xl_write, index=False, sheet_name="DefaultSheet", header=False
282282
)
283-
design_matrix = DesignMatrix(design_path, "DesignSheet01", "DefaultValues")
283+
design_matrix = DesignMatrix(design_path, "DesignSheet", "DefaultSheet")
284284
with open_storage(tmp_path / "storage", mode="w") as storage:
285285
experiment_id = storage.create_experiment(
286286
parameters=[design_matrix.parameter_configuration]

0 commit comments

Comments
 (0)