Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Deltares/Koswat
Browse files Browse the repository at this point in the history
  • Loading branch information
Carsopre committed Oct 18, 2023
2 parents cd30d57 + 1ed44b1 commit 0568e76
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from __future__ import annotations
from dataclasses import dataclass

import math
from dataclasses import dataclass

from koswat.calculations.protocols import ReinforcementProfileProtocol
from koswat.dike.profile.koswat_input_profile_base import KoswatInputProfileBase
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from __future__ import annotations
from dataclasses import dataclass

import math
from dataclasses import dataclass

from koswat.calculations.protocols import ReinforcementInputProfileProtocol
from koswat.dike.profile.koswat_input_profile_base import KoswatInputProfileBase
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
from dataclasses import dataclass

from koswat.calculations.protocols import ReinforcementInputProfileProtocol
from koswat.dike.profile.koswat_input_profile_base import KoswatInputProfileBase


@dataclass
class SoilInputProfile(KoswatInputProfileBase, ReinforcementInputProfileProtocol):
pass
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from __future__ import annotations
from dataclasses import dataclass

import math
from dataclasses import dataclass

from koswat.calculations.protocols import ReinforcementProfileProtocol
from koswat.dike.profile.koswat_input_profile_base import KoswatInputProfileBase
Expand Down
2 changes: 1 addition & 1 deletion koswat/configuration/settings/koswat_scenario.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import annotations
from dataclasses import dataclass

import math
from dataclasses import dataclass

from koswat.configuration.koswat_config_protocol import KoswatConfigProtocol

Expand Down
3 changes: 2 additions & 1 deletion koswat/dike/profile/koswat_input_profile_base.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from __future__ import annotations
from dataclasses import dataclass

import math
from dataclasses import dataclass

from koswat.dike.koswat_input_profile_protocol import KoswatInputProfileProtocol

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
from __future__ import annotations

from dataclasses import dataclass
from itertools import product
from pathlib import Path

import pytest

from koswat.configuration.settings.koswat_scenario import KoswatScenario
from koswat.dike.koswat_profile_protocol import KoswatProfileProtocol
from koswat.dike.profile.koswat_input_profile_base import KoswatInputProfileBase
from itertools import product
from koswat.dike.profile.koswat_profile import KoswatProfileBase

from koswat.dike.profile.koswat_profile_builder import KoswatProfileBuilder
from tests import test_data

Expand Down
1 change: 1 addition & 0 deletions tests/acceptance_scenarios/cases_protocol.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from typing import Protocol

import pytest


Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import pytest
from tests.acceptance_scenarios.cases_protocol import CasesProtocol
from shapely.geometry.point import Point

from tests.acceptance_scenarios.cases_protocol import CasesProtocol


class InitialPointsLookup(CasesProtocol):
default = [
Expand Down
1 change: 1 addition & 0 deletions tests/acceptance_scenarios/layers_cases.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import pytest

from koswat.dike.material.koswat_material_type import KoswatMaterialType
from tests.acceptance_scenarios.acceptance_test_scenario_dataclasses import (
LayersTestCase,
Expand Down
2 changes: 1 addition & 1 deletion tests/calculations/reinforcement_profile_cases.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from dataclasses import dataclass

from koswat.calculations.outside_slope_reinforcement.cofferdam.cofferdam_input_profile import (
CofferDamInputProfile,
)
from koswat.calculations.outside_slope_reinforcement.cofferdam.cofferdam_reinforcement_profile import (
CofferdamReinforcementProfile,
)

from koswat.calculations.protocols.reinforcement_profile_protocol import (
ReinforcementProfileProtocol,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@
from tests.acceptance_scenarios.layers_cases import LayersCases
from tests.calculations import validated_reinforced_profile
from tests.calculations.reinforcement_profile_cases import (
ReinforcementProfileCase,
ReinforcementProfileCaseCombination,
reinforcement_profile_cases,
)
from tests.calculations.reinforcement_profile_cases import ReinforcementProfileCase


def scenario_ini_file() -> List[pytest.param]:
Expand Down

0 comments on commit 0568e76

Please sign in to comment.