From c3cae35de4f4372eeaf114ee5665a2495c74ee64 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Wed, 13 Dec 2023 14:53:58 +0100
Subject: [PATCH] pep8: Fixes code style.
---
src/Model/HydraulicStructures/Basic/Types.py | 2 -
src/Solver/Mage.py | 35 ++++++++-------
.../BasicHydraulicStructures/Translate.py | 44 ++++++++++++++-----
src/config.py | 4 +-
4 files changed, 56 insertions(+), 29 deletions(-)
diff --git a/src/Model/HydraulicStructures/Basic/Types.py b/src/Model/HydraulicStructures/Basic/Types.py
index 63825055..b9aaa3ac 100644
--- a/src/Model/HydraulicStructures/Basic/Types.py
+++ b/src/Model/HydraulicStructures/Basic/Types.py
@@ -181,7 +181,6 @@ class VanneRectangulaireSimplifiee(BasicHS):
]
-
class Borda(BasicHS):
def __init__(self, id: int = -1, name: str = "",
status=None):
@@ -198,7 +197,6 @@ class Borda(BasicHS):
]
-
class UserDefined(BasicHS):
def __init__(self, id: int = -1, name: str = "",
status=None):
diff --git a/src/Solver/Mage.py b/src/Solver/Mage.py
index ea02fd37..a5ee1332 100644
--- a/src/Solver/Mage.py
+++ b/src/Solver/Mage.py
@@ -441,18 +441,18 @@ class Mage(CommandLineSolver):
files = []
sin_dict = {
- "ND":"*",
- "S1":"D",
- "S2":"T",
- "S3":"T",
- "OR":"D",
- "OC":"B",
- "OV":"F",
- "V1":"V",
- "V2":"W",
- "BO":"A",
- "UD":"X",
- "PO":"P",
+ "ND": "*",
+ "S1": "D",
+ "S2": "T",
+ "S3": "T",
+ "OR": "D",
+ "OC": "B",
+ "OV": "F",
+ "V1": "V",
+ "V2": "W",
+ "BO": "A",
+ "UD": "X",
+ "PO": "P",
}
hydraulic_structures = study.river.hydraulic_structures.lst
@@ -467,16 +467,21 @@ class Mage(CommandLineSolver):
for hs in hydraulic_structures:
if hs.input_reach.is_enable:
- f.write('* ouvrage au pk ' +f"{hs.input_kp:>12.1f}"+ ' ' + hs.name + '\n')
- for bhs in hs.basic_structures:
- reach_id = study.river.get_edge_id(hs.input_reach)+1
+ f.write(
+ '* ouvrage au pk ' +
+ f"{hs.input_kp:>12.1f}" + ' ' +
+ hs.name + '\n'
+ )
+ for bhs in hs.basic_structures:
+ reach_id = study.river.get_edge_id(hs.input_reach) + 1
param_str = ' '.join(
[
f'{p.value:>10.3f}'
for p in bhs._data
]
)
+
f.write(
f"{sin_dict[bhs.type]} " +
f"{reach_id} {hs.input_kp:>12.3f} {param_str} " +
diff --git a/src/View/HydraulicStructures/BasicHydraulicStructures/Translate.py b/src/View/HydraulicStructures/BasicHydraulicStructures/Translate.py
index 1a845d4b..6681219e 100644
--- a/src/View/HydraulicStructures/BasicHydraulicStructures/Translate.py
+++ b/src/View/HydraulicStructures/BasicHydraulicStructures/Translate.py
@@ -39,17 +39,39 @@ hydraulic structure values?"
)
self._sub_dict["long_types"] = {
- "ND": _translate("BasicHydraulicStructures", "Not defined"),
- "S1": _translate("BasicHydraulicStructures", "Seuil déversoir"),
- "S2": _translate("BasicHydraulicStructures", "Seuil trapezoidal"),
- "S3": _translate("BasicHydraulicStructures", "Seuil triangulaire"),
- "OR": _translate("BasicHydraulicStructures", "Orifice rectangulaire"),
- "OC": _translate("BasicHydraulicStructures", "Orifice circulaire"),
- "OV": _translate("BasicHydraulicStructures", "Orifice voute"),
- "V1": _translate("BasicHydraulicStructures", "Vanne rectangulaire"),
- "V2": _translate("BasicHydraulicStructures", "Vanne rectangulaire simplifiée"),
- "BO": _translate("BasicHydraulicStructures", "Perte de charge à la Borda"),
- "UD": _translate("BasicHydraulicStructures", "User defined"),
+ "ND": _translate(
+ "BasicHydraulicStructures", "Not defined"
+ ),
+ "S1": _translate(
+ "BasicHydraulicStructures", "Seuil déversoir"
+ ),
+ "S2": _translate(
+ "BasicHydraulicStructures", "Seuil trapezoidal"
+ ),
+ "S3": _translate(
+ "BasicHydraulicStructures", "Seuil triangulaire"
+ ),
+ "OR": _translate(
+ "BasicHydraulicStructures", "Orifice rectangulaire"
+ ),
+ "OC": _translate(
+ "BasicHydraulicStructures", "Orifice circulaire"
+ ),
+ "OV": _translate(
+ "BasicHydraulicStructures", "Orifice voute"
+ ),
+ "V1": _translate(
+ "BasicHydraulicStructures", "Vanne rectangulaire"
+ ),
+ "V2": _translate(
+ "BasicHydraulicStructures", "Vanne rectangulaire simplifiée"
+ ),
+ "BO": _translate(
+ "BasicHydraulicStructures", "Perte de charge à la Borda"
+ ),
+ "UD": _translate(
+ "BasicHydraulicStructures", "User defined"
+ ),
}
self._sub_dict["table_headers"] = {
diff --git a/src/config.py b/src/config.py
index bce76549..00edae1d 100644
--- a/src/config.py
+++ b/src/config.py
@@ -120,7 +120,9 @@ class Config(SQL):
f"INSERT INTO data VALUES ('close_correctly', 'True')")
if int(release) < 4:
- self.execute(f"INSERT INTO data VALUES ('last_solver_name', '')")
+ self.execute(
+ f"INSERT INTO data VALUES ('last_solver_name', '')"
+ )
self.commit()
--
GitLab