Skip to content

Reorganize e2e/models tests #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2025
Merged

Reorganize e2e/models tests #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 tests/e2e/models/results/base_case.csv → ...models/andromede-v1/results/base_case.csv
View file
Open in desktop
File renamed without changes.
0 tests/e2e/models/results/bde_case.csv → .../models/andromede-v1/results/bde_case.csv
View file
Open in desktop
File renamed without changes.
0 ...s/e2e/models/results/cluster_testing1.csv → ...andromede-v1/results/cluster_testing1.csv
View file
Open in desktop
File renamed without changes.
0 ...s/e2e/models/results/cluster_testing2.csv → ...andromede-v1/results/cluster_testing2.csv
View file
Open in desktop
File renamed without changes.
0 tests/e2e/models/results/dsr_case.csv → .../models/andromede-v1/results/dsr_case.csv
View file
Open in desktop
File renamed without changes.
0 .../e2e/models/results/electrolyser_case.csv → ...ndromede-v1/results/electrolyser_case.csv
View file
Open in desktop
File renamed without changes.
0 tests/e2e/models/results/storage_case.csv → ...els/andromede-v1/results/storage_case.csv
View file
Open in desktop
File renamed without changes.
0 .../e2e/models/series/loadClusterTesting.txt → ...ndromede-v1/series/loadClusterTesting.txt
View file
Open in desktop
File renamed without changes.
0 tests/e2e/models/series/load_ts_base028.txt → ...s/andromede-v1/series/load_ts_base028.txt
View file
Open in desktop
File renamed without changes.
0 tests/e2e/models/series/wind_ts_base028.txt → ...s/andromede-v1/series/wind_ts_base028.txt
View file
Open in desktop
File renamed without changes.
0 tests/e2e/models/systems/base_validation.yml → .../andromede-v1/systems/base_validation.yml
View file
Open in desktop
File renamed without changes.
0 tests/e2e/models/systems/bde_system.yml → ...odels/andromede-v1/systems/bde_system.yml
View file
Open in desktop
File renamed without changes.
0 ...e/models/systems/cluster_validation_1.yml → ...omede-v1/systems/cluster_validation_1.yml
View file
Open in desktop
File renamed without changes.
0 ...e/models/systems/cluster_validation_2.yml → ...omede-v1/systems/cluster_validation_2.yml
View file
Open in desktop
File renamed without changes.
0 ...e/models/systems/cluster_validation_3.yml → ...omede-v1/systems/cluster_validation_3.yml
View file
Open in desktop
File renamed without changes.
0 tests/e2e/models/systems/dsr_validation.yml → ...s/andromede-v1/systems/dsr_validation.yml
View file
Open in desktop
File renamed without changes.
0 ...odels/systems/electrolyser_validation.yml → ...de-v1/systems/electrolyser_validation.yml
View file
Open in desktop
File renamed without changes.
0 ...e2e/models/systems/storage_validation.yml → ...dromede-v1/systems/storage_validation.yml
View file
Open in desktop
File renamed without changes.
0 tests/e2e/models/test_andromede_v1_models.py → .../andromede-v1/test_andromede_v1_models.py
View file
Open in desktop
File renamed without changes.
0 tests/e2e/models/conftest.py → ...e2e/models/poc-various-models/conftest.py
View file
Open in desktop
File renamed without changes.
0 tests/e2e/models/libs/__init__.py → ...odels/poc-various-models/libs/__init__.py
View file
Open in desktop
File renamed without changes.
0 tests/e2e/models/libs/ac.yml → ...e2e/models/poc-various-models/libs/ac.yml
View file
Open in desktop
File renamed without changes.
0 tests/e2e/models/libs/lib_unittest.yml → .../poc-various-models/libs/lib_unittest.yml
View file
Open in desktop
File renamed without changes.
0 tests/e2e/models/libs/standard.py → ...odels/poc-various-models/libs/standard.py
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion tests/e2e/models/libs/standard_sc.py → ...ls/poc-various-models/libs/standard_sc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#
# This file is part of the Antares project.

from libs.standard import BALANCE_PORT_TYPE, CONSTANT

from andromede.expression import literal, param, var
from andromede.expression.expression import port_field
from andromede.model import (
Expand All @@ -22,7 +24,6 @@
model,
)
from andromede.model.port import PortFieldDefinition, PortFieldId
from tests.e2e.models.libs.standard import BALANCE_PORT_TYPE, CONSTANT

"""
Simple Convertor model.
Expand Down
0 tests/e2e/models/libs/standard_sc.yml → ...s/poc-various-models/libs/standard_sc.yml
View file
Open in desktop
File renamed without changes.
6 changes: 1 addition & 5 deletions tests/e2e/models/test_ac_link.py → ...models/poc-various-models/test_ac_link.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from pathlib import Path

import pytest
from libs.standard import BALANCE_PORT_TYPE, DEMAND_MODEL, GENERATOR_MODEL

from andromede.model.library import Library, library
from andromede.model.parsing import parse_yaml_library
Expand All @@ -25,11 +26,6 @@
PortRef,
create_component,
)
from tests.e2e.models.libs.standard import (
BALANCE_PORT_TYPE,
DEMAND_MODEL,
GENERATOR_MODEL,
)


@pytest.fixture
Expand Down
3 changes: 2 additions & 1 deletion tests/e2e/models/test_electrolyzer.py → ...s/poc-various-models/test_electrolyzer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#
# This file is part of the Antares project.

from libs.standard import CONSTANT, TIME_AND_SCENARIO_FREE

from andromede.expression import literal, param, var
from andromede.expression.expression import port_field
from andromede.model import (
Expand All @@ -31,7 +33,6 @@
PortRef,
create_component,
)
from tests.e2e.models.libs.standard import CONSTANT, TIME_AND_SCENARIO_FREE

ELECTRICAL_PORT = PortType(id="electrical_port", fields=[PortField("flow")])

Expand Down
21 changes: 9 additions & 12 deletions .../e2e/models/test_electrolyzer_n_inputs.py → ...ious-models/test_electrolyzer_n_inputs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@

import math

from libs.standard import DEMAND_MODEL, GENERATOR_MODEL, NODE_BALANCE_MODEL
from libs.standard_sc import (
CONVERTOR_MODEL,
CONVERTOR_RECEIVE_IN,
DECOMPOSE_1_FLOW_INTO_2_FLOW,
NODE_BALANCE_MODEL_MOD,
TWO_INPUTS_CONVERTOR_MODEL,
)

from andromede.simulation import OutputValues, TimeBlock, build_problem
from andromede.study import (
ConstantData,
Expand All @@ -21,18 +30,6 @@
PortRef,
create_component,
)
from tests.e2e.models.libs.standard import (
DEMAND_MODEL,
GENERATOR_MODEL,
NODE_BALANCE_MODEL,
)
from tests.e2e.models.libs.standard_sc import (
CONVERTOR_MODEL,
CONVERTOR_RECEIVE_IN,
DECOMPOSE_1_FLOW_INTO_2_FLOW,
NODE_BALANCE_MODEL_MOD,
TWO_INPUTS_CONVERTOR_MODEL,
)

"""
This file tests various modellings for an electrolyser with multiple inputs. The models are created in Python directly.
Expand Down
0 ...models/test_electrolyzer_n_inputs_yaml.py → ...models/test_electrolyzer_n_inputs_yaml.py
View file
Open in desktop
File renamed without changes.
5 changes: 3 additions & 2 deletions tests/e2e/models/test_quota_co2.py → ...dels/poc-various-models/test_quota_co2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@

import math

from libs.standard import DEMAND_MODEL, LINK_MODEL, NODE_BALANCE_MODEL
from libs.standard_sc import C02_POWER_MODEL, QUOTA_CO2_MODEL

from andromede.simulation import OutputValues, TimeBlock, build_problem
from andromede.study import (
ConstantData,
Expand All @@ -25,8 +28,6 @@
PortRef,
create_component,
)
from tests.e2e.models.libs.standard import DEMAND_MODEL, LINK_MODEL, NODE_BALANCE_MODEL
from tests.e2e.models.libs.standard_sc import C02_POWER_MODEL, QUOTA_CO2_MODEL


def test_quota_co2() -> None:
Expand Down
0 tests/e2e/models/test_quota_co2_yaml.py → ...poc-various-models/test_quota_co2_yaml.py
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions ...models/test_short_term_storage_complex.py → ...models/test_short_term_storage_complex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
import math

import pandas as pd
from libs.standard import (
DEMAND_MODEL,
NODE_BALANCE_MODEL,
SPILLAGE_MODEL,
UNSUPPLIED_ENERGY_MODEL,
)
from libs.standard_sc import SHORT_TERM_STORAGE_COMPLEX

from andromede.simulation import BlockBorderManagement, TimeBlock, build_problem
from andromede.study import (
Expand All @@ -12,13 +19,6 @@
TimeScenarioSeriesData,
create_component,
)
from tests.e2e.models.libs.standard import (
DEMAND_MODEL,
NODE_BALANCE_MODEL,
SPILLAGE_MODEL,
UNSUPPLIED_ENERGY_MODEL,
)
from tests.e2e.models.libs.standard_sc import SHORT_TERM_STORAGE_COMPLEX


def generate_data(
Expand Down
Loading