Andromede V1 model validation

[aoustry]

No description provided.

[tbittar]

Do you need a time and scenario-dependent efficiency for the electrolyzer ?

[aoustry]

Not for the moment, I changed this.

[tbittar]

Maybe rename the file to test_andromede_v1_models to refer to the library name

[aoustry]

Done

[tbittar]

As all results file are in the results directory, you may remove _results from the file name for conciseness

[tbittar]

Can you explain what you try to validate (that is different from validation_2 and validation_3) ?

[tbittar]

Suggested change

	@pytest.mark.parametrize(
	"system_file, optim_result_file, timespan, batch, relative_accuracy, results_dir, systems_dir, series_dir",
	[
	(
	"dsr_validation.yml",
	"dsr_case_results.csv",
	168,
	20,
	1e-6,
	"tests/e2e/models/results/",
	"tests/e2e/models/systems/",
	"tests/e2e/models/series/",
	),
	(
	"base_validation.yml",
	"base_case_results.csv",
	168,
	20,
	1e-6,
	"tests/e2e/models/results/",
	"tests/e2e/models/systems/",
	"tests/e2e/models/series/",
	),
	(
	"electrolyser_validation.yml",
	"electrolyser_case_results.csv",
	168,
	20,
	1e-6,
	"tests/e2e/models/results/",
	"tests/e2e/models/systems/",
	"tests/e2e/models/series/",
	),
	(
	"storage_validation.yml",
	"storage_case_results.csv",
	168,
	20,
	1e-6,
	"tests/e2e/models/results/",
	"tests/e2e/models/systems/",
	"tests/e2e/models/series/",
	),
	(
	"bde_system.yml",
	"bde_case_results.csv",
	168,
	20,
	1e-6,
	"tests/e2e/models/results/",
	"tests/e2e/models/systems/",
	"tests/e2e/models/series/",
	),
	(
	"cluster_validation_1.yml",
	"cluster_testing1_results.csv",
	168,
	20,
	1e-6,
	"tests/e2e/models/results/",
	"tests/e2e/models/systems/",
	"tests/e2e/models/series/",
	),
	(
	"cluster_validation_2.yml",
	"cluster_testing2_results.csv",
	168,
	20,
	1e-4, # Default Fico XPRESS Tolerance
	"tests/e2e/models/results/",
	"tests/e2e/models/systems/",
	"tests/e2e/models/series/",
	),
	],
	)
	@pytest.fixture
	def data_dir() -> Path:
	return Path(__file__).parent
	@pytest.fixture
	def results_dir(data_dir: Path) -> Path:
	return data_dir / "results"
	@pytest.fixture
	def systems_dir(data_dir: Path) -> Path:
	return data_dir / "systems"
	@pytest.fixture
	def series_dir(data_dir: Path) -> Path:
	return data_dir / "series"
	@pytest.mark.parametrize(
	"system_file, optim_result_file, timespan, batch, relative_accuracy",
	[
	(
	"dsr_validation.yml",
	"dsr_case_results.csv",
	168,
	20,
	1e-6,
	),
	(
	"base_validation.yml",
	"base_case_results.csv",
	168,
	20,
	1e-6,
	),
	(
	"electrolyser_validation.yml",
	"electrolyser_case_results.csv",
	168,
	20,
	1e-6,
	),
	(
	"storage_validation.yml",
	"storage_case_results.csv",
	168,
	20,
	1e-6,
	),
	(
	"bde_system.yml",
	"bde_case_results.csv",
	168,
	20,
	1e-6,
	),
	(
	"cluster_validation_1.yml",
	"cluster_testing1_results.csv",
	168,
	20,
	1e-6,
	),
	(
	"cluster_validation_2.yml",
	"cluster_testing2_results.csv",
	168,
	20,
	1e-4, # Default Fico XPRESS Tolerance
	),
	],
	)

[aoustry]

Done, thank you for the suggestion

[tbittar]

Suggested change

	with open(systems_dir + system_file) as compo_file:
	with open(systems_dir / system_file) as compo_file:

[aoustry]

Done

[tbittar]

Suggested change

	results_dir + optim_result_file, header=None
	results_dir / optim_result_file, header=None

[aoustry]

Done

[tbittar]

Suggested change

	with open(
	"src/andromede/libs/antares_historic/antares_historic.yml"
	) as lib_file1:
	with open(
	"src/andromede/libs/reference_models/andromede_v1_models.yml"
	) as lib_file2:
	input_libraries = [
	parse_yaml_library(lib_file1),
	parse_yaml_library(lib_file2),
	]
	with open(
	"src/andromede/libs/antares_historic/antares_historic.yml"
	) as lib_file1:
	lib_historic = parse_yaml_library(lib_file1)
	with open(
	"src/andromede/libs/reference_models/andromede_v1_models.yml"
	) as lib_file2:
	lib_v1 = parse_yaml_library(lib_file2)
	input_libraries = [
	parse_yaml_library(lib_file1),
	parse_yaml_library(lib_file2),
	]

You should put under the with only the code that needs to have the files open, as when we exit the with part the file is closed. In the current state, the two files stay open for the run

[aoustry]

Done

[tbittar]

Only put input_component = parse_yaml_components(compo_file) under this with

[aoustry]

done

[tbittar]

As the libs are the same in all tests, I would make fixtures of them

@pytest.fixture
def lib_historic() -> InputLibrary:
    with open(
            "src/andromede/libs/antares_historic/antares_historic.yml"
        ) as lib_file1:
            lib_historic = parse_yaml_library(lib_file1)
    return lib_historic

[aoustry]

Done