From fc6916bb3e5f3538a01156bdf28df311f1a2db70 Mon Sep 17 00:00:00 2001 From: Theophile Terraz Date: Fri, 12 Dec 2025 14:18:09 +0100 Subject: [PATCH] lot of debug --- src/Model/AdditionalFile/AddFile.py | 2 +- src/Model/BoundaryCondition/BoundaryCondition.py | 3 ++- src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py | 2 +- src/Model/D90AdisTS/D90AdisTS.py | 2 +- src/Model/D90AdisTS/D90AdisTSSpec.py | 2 +- src/Model/DIFAdisTS/DIFAdisTS.py | 2 +- src/Model/DIFAdisTS/DIFAdisTSSpec.py | 2 +- src/Model/Friction/Friction.py | 2 +- src/Model/Geometry/Profile.py | 2 +- src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py | 2 +- .../InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py | 2 +- src/Model/LateralContribution/LateralContribution.py | 2 +- src/Model/Network/Edge.py | 3 ++- src/Model/Network/Node.py | 3 ++- src/Model/OutputRKAdists/OutputRKAdists.py | 2 +- src/Model/Pollutants/Pollutants.py | 2 +- src/Model/REPLine/REPLine.py | 2 +- src/Model/Reservoir/Reservoir.py | 2 +- src/Model/SedimentLayer/SedimentLayer.py | 2 +- 19 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/Model/AdditionalFile/AddFile.py b/src/Model/AdditionalFile/AddFile.py index 76e7c963..1004407d 100644 --- a/src/Model/AdditionalFile/AddFile.py +++ b/src/Model/AdditionalFile/AddFile.py @@ -45,7 +45,7 @@ class AddFile(SQLSubModel): self._path = path self._text = text - AddFile._id_cnt = max(id, AddFile._id_cnt+1) + AddFile._id_cnt = max(self.id + 1, AddFile._id_cnt + 1) def __getitem__(self, key): value = None diff --git a/src/Model/BoundaryCondition/BoundaryCondition.py b/src/Model/BoundaryCondition/BoundaryCondition.py index 452fdd65..435249c9 100644 --- a/src/Model/BoundaryCondition/BoundaryCondition.py +++ b/src/Model/BoundaryCondition/BoundaryCondition.py @@ -53,7 +53,8 @@ class BoundaryCondition(SQLSubModel): self._header = [] self._types = [float, float] - BoundaryCondition._id_cnt = max(BoundaryCondition._id_cnt + 1, self.id) + BoundaryCondition._id_cnt = max(BoundaryCondition._id_cnt + 1, + self.id + 1) @classmethod def _db_create(cls, execute): diff --git a/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py b/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py index 8420e28d..e76a4f83 100644 --- a/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py +++ b/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py @@ -54,7 +54,7 @@ class BoundaryConditionAdisTS(SQLSubModel): self._types = [self.time_convert, float] BoundaryConditionAdisTS._id_cnt = max( - BoundaryConditionAdisTS._id_cnt + 1, self.id) + BoundaryConditionAdisTS._id_cnt + 1, self.id + 1) @classmethod def _db_create(cls, execute): diff --git a/src/Model/D90AdisTS/D90AdisTS.py b/src/Model/D90AdisTS/D90AdisTS.py index 6584d702..73b0f431 100644 --- a/src/Model/D90AdisTS/D90AdisTS.py +++ b/src/Model/D90AdisTS/D90AdisTS.py @@ -53,7 +53,7 @@ class D90AdisTS(SQLSubModel): D90AdisTS._id_cnt = max( D90AdisTS._id_cnt + 1, - self.id + self.id + 1 ) @classmethod diff --git a/src/Model/D90AdisTS/D90AdisTSSpec.py b/src/Model/D90AdisTS/D90AdisTSSpec.py index e367f969..47e327d0 100644 --- a/src/Model/D90AdisTS/D90AdisTSSpec.py +++ b/src/Model/D90AdisTS/D90AdisTSSpec.py @@ -49,7 +49,7 @@ class D90AdisTSSpec(SQLSubModel): self._d90 = None self._enabled = True - D90AdisTSSpec._id_cnt = max(D90AdisTSSpec._id_cnt + 1, self.id) + D90AdisTSSpec._id_cnt = max(D90AdisTSSpec._id_cnt + 1, self.id + 1) @classmethod def _db_create(cls, execute): diff --git a/src/Model/DIFAdisTS/DIFAdisTS.py b/src/Model/DIFAdisTS/DIFAdisTS.py index 39592369..e4744773 100644 --- a/src/Model/DIFAdisTS/DIFAdisTS.py +++ b/src/Model/DIFAdisTS/DIFAdisTS.py @@ -57,7 +57,7 @@ class DIFAdisTS(SQLSubModel): DIFAdisTS._id_cnt = max( DIFAdisTS._id_cnt + 1, - self.id + self.id + 1 ) @classmethod diff --git a/src/Model/DIFAdisTS/DIFAdisTSSpec.py b/src/Model/DIFAdisTS/DIFAdisTSSpec.py index cfb9177d..c14ebdff 100644 --- a/src/Model/DIFAdisTS/DIFAdisTSSpec.py +++ b/src/Model/DIFAdisTS/DIFAdisTSSpec.py @@ -51,7 +51,7 @@ class DIFAdisTSSpec(SQLSubModel): self._c = None self._enabled = True - DIFAdisTSSpec._id_cnt = max(DIFAdisTSSpec._id_cnt + 1, self.id) + DIFAdisTSSpec._id_cnt = max(DIFAdisTSSpec._id_cnt + 1, self.id + 1) @classmethod def _db_create(cls, execute): diff --git a/src/Model/Friction/Friction.py b/src/Model/Friction/Friction.py index e8cfed55..63a028d5 100644 --- a/src/Model/Friction/Friction.py +++ b/src/Model/Friction/Friction.py @@ -41,7 +41,7 @@ class Friction(SQLSubModel): else: self.id = id - Friction._id_cnt = max(self.id, Friction._id_cnt+1) + Friction._id_cnt = max(self.id + 1, Friction._id_cnt + 1) self._name = name self._edge = None diff --git a/src/Model/Geometry/Profile.py b/src/Model/Geometry/Profile.py index 3c452ed4..1d510a92 100644 --- a/src/Model/Geometry/Profile.py +++ b/src/Model/Geometry/Profile.py @@ -44,7 +44,7 @@ class Profile(object): else: self.id = id - Profile._id_cnt = max(self.id, Profile._id_cnt+1) + Profile._id_cnt = max(self.id + 1, Profile._id_cnt + 1) self._num = int(num) self._code1 = int(code1) diff --git a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py index 3ecfefe8..6201485b 100644 --- a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py +++ b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py @@ -58,7 +58,7 @@ class InitialConditionsAdisTS(SQLSubModel): InitialConditionsAdisTS._id_cnt = max( InitialConditionsAdisTS._id_cnt + 1, - self.id + self.id + 1 ) @classmethod diff --git a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py index be157631..f7d4ce44 100644 --- a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py +++ b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py @@ -53,7 +53,7 @@ class ICAdisTSSpec(SQLSubModel): self._rate = None self._enabled = True - ICAdisTSSpec._id_cnt = max(ICAdisTSSpec._id_cnt + 1, self.id) + ICAdisTSSpec._id_cnt = max(ICAdisTSSpec._id_cnt + 1, self.id + 1) @classmethod def _db_create(cls, execute): diff --git a/src/Model/LateralContribution/LateralContribution.py b/src/Model/LateralContribution/LateralContribution.py index bfed1d14..9b23f3e5 100644 --- a/src/Model/LateralContribution/LateralContribution.py +++ b/src/Model/LateralContribution/LateralContribution.py @@ -55,7 +55,7 @@ class LateralContribution(SQLSubModel): self._types = [float, float] LateralContribution._id_cnt = max( - LateralContribution._id_cnt + 1, self.id) + LateralContribution._id_cnt + 1, self.id + 1) @classmethod def _db_create(cls, execute): diff --git a/src/Model/Network/Edge.py b/src/Model/Network/Edge.py index e1a83e7c..a710f0e8 100644 --- a/src/Model/Network/Edge.py +++ b/src/Model/Network/Edge.py @@ -31,11 +31,12 @@ class Edge(object): self._status = status if id == -1: - type(self)._id_cnt += 1 self.id = type(self)._id_cnt else: self.id = id + type(self)._id_cnt = max(self.id + 1, type(self)._id_cnt + 1) + self._name = name self.node1 = node1 diff --git a/src/Model/Network/Node.py b/src/Model/Network/Node.py index 3cd68b1e..5753d8ef 100644 --- a/src/Model/Network/Node.py +++ b/src/Model/Network/Node.py @@ -30,11 +30,12 @@ class Node(object): self._status = status if id == -1: - type(self)._id_cnt += 1 self.id = type(self)._id_cnt else: self.id = id + type(self)._id_cnt = max(self.id + 1, type(self)._id_cnt + 1) + self._name = name self.pos = Point(x, y) diff --git a/src/Model/OutputRKAdists/OutputRKAdists.py b/src/Model/OutputRKAdists/OutputRKAdists.py index 86733b96..d8925d89 100644 --- a/src/Model/OutputRKAdists/OutputRKAdists.py +++ b/src/Model/OutputRKAdists/OutputRKAdists.py @@ -52,7 +52,7 @@ class OutputRKAdists(SQLSubModel): self._enabled = True OutputRKAdists._id_cnt = max( - OutputRKAdists._id_cnt + 1, self.id) + OutputRKAdists._id_cnt + 1, self.id + 1) @property def reach(self): diff --git a/src/Model/Pollutants/Pollutants.py b/src/Model/Pollutants/Pollutants.py index 9171aae4..63616b5d 100644 --- a/src/Model/Pollutants/Pollutants.py +++ b/src/Model/Pollutants/Pollutants.py @@ -54,7 +54,7 @@ class Pollutants(SQLSubModel): self._data = [] Pollutants._id_cnt = max( - Pollutants._id_cnt + 1, self.id) + Pollutants._id_cnt + 1, self.id + 1) @property def name(self): diff --git a/src/Model/REPLine/REPLine.py b/src/Model/REPLine/REPLine.py index 336260f4..04396ed0 100644 --- a/src/Model/REPLine/REPLine.py +++ b/src/Model/REPLine/REPLine.py @@ -45,7 +45,7 @@ class REPLine(SQLSubModel): self._line = line self._solvers = solvers - REPLine._id_cnt = max(id, REPLine._id_cnt+1) + REPLine._id_cnt = max(self.id + 1, REPLine._id_cnt + 1) def __getitem__(self, key): value = None diff --git a/src/Model/Reservoir/Reservoir.py b/src/Model/Reservoir/Reservoir.py index 1d719348..2e7fb9c2 100644 --- a/src/Model/Reservoir/Reservoir.py +++ b/src/Model/Reservoir/Reservoir.py @@ -42,7 +42,7 @@ class Reservoir(SQLSubModel): self._node = None self._data = [] - Reservoir._id_cnt = max(Reservoir._id_cnt + 1, self.id) + Reservoir._id_cnt = max(Reservoir._id_cnt + 1, self.id + 1) @classmethod def _db_create(cls, execute): diff --git a/src/Model/SedimentLayer/SedimentLayer.py b/src/Model/SedimentLayer/SedimentLayer.py index b8fc19dc..1ac03c7a 100644 --- a/src/Model/SedimentLayer/SedimentLayer.py +++ b/src/Model/SedimentLayer/SedimentLayer.py @@ -51,7 +51,7 @@ class Layer(SQLSubModel): else: self.id = id - Layer._id_cnt = max(id, Layer._id_cnt+1) + Layer._id_cnt = max(self.id + 1, Layer._id_cnt + 1) @property def name(self):