src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py

@@ -64,7 +64,6 @@ class BoundaryConditionAdisTS(SQLSubModel):
         execute(f"""
           CREATE TABLE boundary_condition_adists{ext}(
             {cls.create_db_add_pamhyr_id()},
-            deleted BOOLEAN NOT NULL DEFAULT FALSE,
             pollutant INTEGER NOT NULL,
             type TEXT NOT NULL,
             node INTEGER,
@@ -206,7 +205,7 @@ class BoundaryConditionAdisTS(SQLSubModel):
             return new
 
         table = execute(
-            "SELECT pamhyr_id, deleted, pollutant, type, node, scenario " +
+            "SELECT pamhyr_id, pollutant, type, node, scenario " +
             "FROM boundary_condition_adists " +
             f"WHERE scenario = {scenario.id} " +
             f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) "
@@ -217,7 +216,6 @@ class BoundaryConditionAdisTS(SQLSubModel):
                 it = iter(row)
 
                 pid = next(it)
-                deleted = (next(it) == 1)
                 pollutant = next(it)
                 bc_type = next(it)
                 node = next(it)
@@ -229,8 +227,6 @@ class BoundaryConditionAdisTS(SQLSubModel):
                     status=status,
                     owner_scenario=owner_scenario
                 )
-                if deleted:
-                    bc.set_as_deleted()
 
                 bc.type = bc_type
 
@@ -291,12 +287,10 @@ class BoundaryConditionAdisTS(SQLSubModel):
 
         execute(
             "INSERT INTO " +
-            "boundary_condition_adists(" +
+            "boundary_condition_adists(id, pollutant, type, " +
-            "pamhyr_id, deleted, pollutant, type, " +
             "node, scenario) " +
             "VALUES (" +
-            f"{self.id}, {self._db_format(self.is_deleted())}, " +
+            f"{self.id}, {self._pollutant}, " +
-            f"{self._pollutant}, " +
             f"'{self._db_format(self._type)}', {node}, " +
             f"{self._status.scenario_id}" +
             ")"
@@ -308,8 +302,7 @@ class BoundaryConditionAdisTS(SQLSubModel):
 
             execute(
                 "INSERT INTO " +
-                "boundary_condition_data_adists(" +
+                "boundary_condition_data_adists(data0, data1, bc, scenario) " +
-                "data0, data1, bc, scenario) " +
                 f"VALUES ('{data0}', {data1}, {self.id}, " +
                 f"{self._status.scenario_id})"
             )

src/Model/BoundaryConditionsAdisTS/BoundaryConditionsAdisTSList.py

@@ -19,7 +19,7 @@
 from copy import copy
 from tools import trace, timer
 
-from Model.Tools.PamhyrListExt import PamhyrModelList
+from Model.Tools.PamhyrList import PamhyrModelList
 from Model.Except import NotImplementedMethodeError
 
 from Model.BoundaryConditionsAdisTS.BoundaryConditionAdisTS \

src/Model/D90AdisTS/D90AdisTS.py

@@ -54,7 +54,6 @@ class D90AdisTS(SQLSubModel):
         execute(f"""
           CREATE TABLE d90_adists{ext}(
             {cls.create_db_add_pamhyr_id()},
-            deleted BOOLEAN NOT NULL DEFAULT FALSE,
             name TEXT NOT NULL,
             d90 REAL NOT NULL,
             enabled BOOLEAN NOT NULL,
@@ -111,7 +110,7 @@ class D90AdisTS(SQLSubModel):
             return new
 
         table = execute(
-            "SELECT pamhyr_id, deleted, name, d90, enabled, scenario " +
+            "SELECT pamhyr_id, name, d90, enabled, scenario " +
             "FROM d90_adists " +
             f"WHERE scenario = {scenario.id} " +
             f"AND pamhyr_id NOT IN ({', '.join(map(str, loaded))}) "
@@ -122,7 +121,6 @@ class D90AdisTS(SQLSubModel):
                 it = iter(row)
 
                 pid = next(it)
-                deleted = (next(it) == 1)
                 name = next(it)
                 value_d90 = next(it)
                 enabled = (next(it) == 1)
@@ -134,8 +132,6 @@ class D90AdisTS(SQLSubModel):
                     status=status,
                     owner_scenario=owner_scenario
                 )
-                if deleted:
-                    d90.set_as_deleted()
 
                 d90.d90 = value_d90
                 d90.enabled = enabled
@@ -169,12 +165,10 @@ class D90AdisTS(SQLSubModel):
         execute(
             "INSERT INTO " +
             "d90_adists(" +
-            "pamhyr_id, deleted, " +
+            "pamhyr_id, name, d90, enabled, scenario" +
-            "name, d90, enabled, scenario" +
             ") " +
             "VALUES (" +
-            f"{self.id}, {self._db_format(self.is_deleted())}, " +
+            f"{self.id}, '{self._db_format(self._name)}', " +
-            f"'{self._db_format(self._name)}', " +
             f"{d90}, {self._enabled}, {self._status.scenario_id}" +
             ")"
         )
@@ -228,36 +222,19 @@ class D90AdisTS(SQLSubModel):
         return n
 
     def delete(self, data):
-        list(
+        self._data = list(
-            map(
+            filter(
-                lambda x: x.set_as_deleted(),
+                lambda x: x not in data,
-                data
+                self._data
             )
         )
         self.modified()
 
     def delete_i(self, indexes):
-        list(
+        for ind in indexes:
-            map(
+            del self._data[ind]
-                lambda e: e[1].set_as_deleted(),
-                filter(
-                    lambda e: e[0] in indexes,
-                    enumerate(self._data)
-                )
-            )
-        )
         self.modified()
 
     def insert(self, index, data):
-        if data in self._data:
+        self._data.insert(index, data)
-            self.undelete([data])
-        else:
-            self._data.insert(index, data)
-
-        self.modified()
-
-    def undelete(self, lst):
-        for x in lst:
-            x.set_as_not_deleted()
-
         self.modified()

src/Model/D90AdisTS/D90AdisTSList.py

@@ -19,7 +19,7 @@
 from copy import copy
 from tools import trace, timer
 
-from Model.Tools.PamhyrListExt import PamhyrModelList
+from Model.Tools.PamhyrList import PamhyrModelList
 from Model.D90AdisTS.D90AdisTS import D90AdisTS
 
 

src/Model/D90AdisTS/D90AdisTSSpec.py

@@ -51,7 +51,6 @@ class D90AdisTSSpec(SQLSubModel):
         execute(f"""
           CREATE TABLE d90_adists_spec{ext}(
             {cls.create_db_add_pamhyr_id()},
-            deleted BOOLEAN NOT NULL DEFAULT FALSE,
             d90_default INTEGER NOT NULL,
             name TEXT NOT NULL,
             reach INTEGER NOT NULL,
@@ -138,8 +137,7 @@ class D90AdisTSSpec(SQLSubModel):
             return new
 
         table = execute(
-            "SELECT pamhyr_id, deleted, " +
+            "SELECT pamhyr_id, name, reach, start_rk, end_rk, " +
-            f"name, reach, start_rk, end_rk, " +
             "d90, enabled, scenario " +
             "FROM d90_adists_spec " +
             f"WHERE d90_default = {data['d90_default_id']} " +
@@ -152,7 +150,6 @@ class D90AdisTSSpec(SQLSubModel):
                 it = iter(row)
 
                 pid = next(it)
-                deleted = (next(it) == 1)
                 name = next(it)
                 reach = next(it)
                 start_rk = next(it)
@@ -167,8 +164,6 @@ class D90AdisTSSpec(SQLSubModel):
                     status=status,
                     owner_scenario=owner_scenario
                 )
-                if deleted:
-                    new_spec.is_deleted()
 
                 new_spec.reach = reach
                 new_spec.start_rk = start_rk
@@ -193,12 +188,10 @@ class D90AdisTSSpec(SQLSubModel):
 
         execute(
             "INSERT INTO " +
-            "d90_spec(pamhyr_id, deleted, " +
+            "d90_spec(pamhyr_id, d90_default, name, reach, " +
-            "d90_default, name, reach, " +
             "start_rk, end_rk, d90, enabled, scenario) " +
             "VALUES (" +
-            f"{self.id}, {self._db_format(self.is_deleted())}" +
+            f"{self.id}, {d90_default}, " +
-            f"{d90_default}, " +
             f"'{self._db_format(self._name_section)}', " +
             f"{self._reach}, " +
             f"{self._start_rk}, {self._end_rk}, " +

src/Model/DIFAdisTS/DIFAdisTS.py

@@ -282,36 +282,19 @@ class DIFAdisTS(SQLSubModel):
         return n
 
     def delete(self, data):
-        list(
+        self._data = list(
-            map(
+            filter(
-                lambda x: x.set_as_deleted(),
+                lambda x: x not in data,
-                data
+                self._data
             )
         )
         self.modified()
 
     def delete_i(self, indexes):
-        list(
+        for ind in indexes:
-            map(
+            del self._data[ind]
-                lambda e: e[1].set_as_deleted(),
-                filter(
-                    lambda e: e[0] in indexes,
-                    enumerate(self._data)
-                )
-            )
-        )
         self.modified()
 
     def insert(self, index, data):
-        if data in self._data:
+        self._data.insert(index, data)
-            self.undelete([data])
-        else:
-            self._data.insert(index, data)
-
-        self.modified()
-
-    def undelete(self, lst):
-        for x in lst:
-            x.set_as_not_deleted()
-
         self.modified()

src/Model/DIFAdisTS/DIFAdisTSList.py

@@ -19,7 +19,7 @@
 from copy import copy
 from tools import trace, timer
 
-from Model.Tools.PamhyrListExt import PamhyrModelList
+from Model.Tools.PamhyrList import PamhyrModelList
 from Model.DIFAdisTS.DIFAdisTS import DIFAdisTS
 
 

src/Model/DIFAdisTS/DIFAdisTSSpec.py

@@ -59,7 +59,6 @@ class DIFAdisTSSpec(SQLSubModel):
         execute(f"""
           CREATE TABLE dif_adists_spec{ext}(
             {cls.create_db_add_pamhyr_id()},
-            deleted BOOLEAN NOT NULL DEFAULT FALSE,
             dif_default INTEGER NOT NULL,
             method TEXT NOT NULL,
             reach INTEGER NOT NULL,
@@ -150,7 +149,7 @@ class DIFAdisTSSpec(SQLSubModel):
             return new
 
         table = execute(
-            "SELECT pamhyr_id, deleted, method, reach, start_rk, end_rk, " +
+            "SELECT pamhyr_id, method, reach, start_rk, end_rk, " +
             "dif, b, c, enabled, scenario " +
             "FROM dif_adists_spec " +
             f"WHERE dif_default = {data['dif_default_id']} " +
@@ -163,7 +162,6 @@ class DIFAdisTSSpec(SQLSubModel):
                 it = iter(row)
 
                 id = next(it)
-                deleted = (next(it) == 1)
                 method = next(it)
                 reach = next(it)
                 start_rk = next(it)
@@ -180,8 +178,6 @@ class DIFAdisTSSpec(SQLSubModel):
                     status=status,
                     owner_scenario=owner_scenario
                 )
-                if deleted:
-                    new_spec.set_as_deleted()
 
                 new_spec.reach = reach
                 new_spec.start_rk = start_rk
@@ -208,12 +204,10 @@ class DIFAdisTSSpec(SQLSubModel):
 
         execute(
             "INSERT INTO " +
-            "dif_adists_spec(pamhyr_id, deleted, " +
+            "dif_adists_spec(pamhyr_id, dif_default, method, reach, " +
-            "dif_default, method, reach, " +
             "start_rk, end_rk, dif, b, c, enabled, scenario) " +
             "VALUES (" +
-            f"{self.id}, {self._db_format(self.is_deleted())}" +
+            f"{self.id}, {dif_default}, " +
-            f"{dif_default}, " +
             f"'{self._db_format(self._method)}', " +
             f"{self._reach}, " +
             f"{self._start_rk}, {self._end_rk}, " +

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py

@@ -60,7 +60,6 @@ class InitialConditionsAdisTS(SQLSubModel):
         execute(f"""
           CREATE TABLE initial_conditions_adists{ext}(
             {cls.create_db_add_pamhyr_id()},
-            deleted BOOLEAN NOT NULL DEFAULT FALSE,
             pollutant INTEGER NOT NULL,
             name TEXT NOT NULL,
             concentration REAL NOT NULL,
@@ -148,8 +147,7 @@ class InitialConditionsAdisTS(SQLSubModel):
             return new
 
         table = execute(
-            "SELECT pamhyr_id, deleted, " +
+            "SELECT pamhyr_id, pollutant, name, concentration, eg, em, ed, " +
-            "pollutant, name, concentration, eg, em, ed, " +
             "enabled, scenario " +
             "FROM initial_conditions_adists " +
             f"WHERE scenario = {scenario.id} " +
@@ -161,7 +159,6 @@ class InitialConditionsAdisTS(SQLSubModel):
                 it = iter(row)
 
                 pid = next(it)
-                deleted = (next(it) == 1)
                 pollutant = next(it)
                 name = next(it)
                 concentration = next(it)
@@ -177,8 +174,6 @@ class InitialConditionsAdisTS(SQLSubModel):
                     status=status,
                     owner_scenario=owner_scenario
                 )
-                if deleted:
-                    ic.set_as_deleted()
 
                 ic.pollutant = pollutant
                 ic.concentration = concentration
@@ -232,12 +227,11 @@ class InitialConditionsAdisTS(SQLSubModel):
         sql = (
             "INSERT INTO " +
             "initial_conditions_adists(" +
-            "pamhyr_id, deletec, pollutant, name, concentration, " +
+            "pamhyr_id, pollutant, name, concentration, " +
             "eg, em, ed, enabled, scenario" +
             ") " +
             "VALUES (" +
-            f"{self.id}, {self.is_deleted()}, " +
+            f"{self.id}, {pollutant}, '{self._db_format(self._name)}', " +
-            f"{pollutant}, '{self._db_format(self._name)}', " +
             f"{concentration}, {eg}, {em}, {ed}, {self._enabled}, " +
             f"{self._status.scenario_id}" +
             ")"

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSList.py

@@ -19,7 +19,7 @@
 from copy import copy
 from tools import trace, timer
 
-from Model.Tools.PamhyrListExt import PamhyrModelList
+from Model.Tools.PamhyrList import PamhyrModelList
 from Model.InitialConditionsAdisTS.InitialConditionsAdisTS \
     import InitialConditionsAdisTS
 

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py

@@ -52,7 +52,6 @@ class ICAdisTSSpec(SQLSubModel):
         execute(f"""
           CREATE TABLE initial_conditions_adists_spec{ext}(
             {cls.create_db_add_pamhyr_id()},
-            deleted BOOLEAN NOT NULL DEFAULT FALSE,
             ic_default INTEGER NOT NULL,
             name TEXT NOT NULL,
             reach INTEGER NOT NULL,
@@ -150,7 +149,7 @@ class ICAdisTSSpec(SQLSubModel):
             return new
 
         table = execute(
-            "SELECT pamhyr_id, deleted, name, reach, start_rk, end_rk, " +
+            "SELECT pamhyr_id, name, reach, start_rk, end_rk, " +
             "concentration, eg, em, ed, rate, enabled, scenario " +
             "FROM initial_conditions_adists_spec " +
             f"WHERE ic_default = {data['ic_default_id']} " +
@@ -163,7 +162,6 @@ class ICAdisTSSpec(SQLSubModel):
                 it = iter(row)
 
                 id = next(it)
-                deleted = (next(it) == 1)
                 name = next(it)
                 reach = next(it)
                 start_rk = next(it)
@@ -181,8 +179,6 @@ class ICAdisTSSpec(SQLSubModel):
                     status=status,
                     owner_scenario=owner_scenario
                 )
-                if deleted:
-                    new_spec.set_as_deleted()
 
                 new_spec.reach = reach
                 new_spec.start_rk = start_rk
@@ -211,13 +207,11 @@ class ICAdisTSSpec(SQLSubModel):
 
         sql = (
             "INSERT INTO " +
-            "initial_conditions_adists_spec(id, deleted, " +
+            "initial_conditions_adists_spec(id, ic_default, name, reach, " +
-            "ic_default, name, reach, " +
             "start_rk, end_rk, concentration, eg, em, ed, rate, " +
             "enabled, scenario) " +
             "VALUES (" +
-            f"{self.id}, {self._db_format(self.is_deleted())}, " +
+            f"{self.id}, {ic_default}, " +
-            f"{ic_default}, " +
             f"'{self._db_format(self._name_section)}', " +
             f"{self._reach}, " +
             f"{self._start_rk}, {self._end_rk}, " +

src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py

@@ -65,7 +65,6 @@ class LateralContributionAdisTS(SQLSubModel):
         execute(f"""
           CREATE TABLE lateral_contribution_adists{ext}(
             {cls.create_db_add_pamhyr_id()},
-            deleted BOOLEAN NOT NULL DEFAULT FALSE,
             pollutant INTEGER NOT NULL,
             reach INTEGER NOT NULL,
             begin_rk REAL NOT NULL,
@@ -82,7 +81,6 @@ class LateralContributionAdisTS(SQLSubModel):
         execute(f"""
           CREATE TABLE lateral_contribution_data_adists{ext}(
             {cls.create_db_add_pamhyr_id()},
-            deleted BOOLEAN NOT NULL DEFAULT FALSE,
             data0 TEXT NOT NULL,
             data1 TEXT NOT NULL,
             lca INTEGER,
@@ -206,7 +204,7 @@ class LateralContributionAdisTS(SQLSubModel):
             return new
 
         table = execute(
-            "SELECT pamhyr_id, deleted, pollutant, reach, " +
+            "SELECT pamhyr_id, pollutant, reach, " +
             "begin_rk, end_rk, scenario " +
             "FROM lateral_contribution_adists " +
             f"WHERE scenario = {scenario.id} " +
@@ -218,7 +216,6 @@ class LateralContributionAdisTS(SQLSubModel):
                 it = iter(row)
 
                 pid = next(it)
-                deleted = (next(it) == 1)
                 pollutant = next(it)
                 reach = next(it)
                 brk = next(it)
@@ -231,8 +228,6 @@ class LateralContributionAdisTS(SQLSubModel):
                     status=status,
                     owner_scenario=owner_scenario
                 )
-                if deleted:
-                    lca.set_as_deleted()
 
                 lca.reach = reach
                 lca.begin_rk = brk
@@ -279,11 +274,10 @@ class LateralContributionAdisTS(SQLSubModel):
 
         execute(
             "INSERT INTO " +
-            "lateral_contribution_adists(id, deleted," +
+            "lateral_contribution_adists(id, " +
             "pollutant, reach, begin_rk, end_rk, scenario) " +
             "VALUES (" +
-            f"{self.id}, {self._db_format(self.is_deleted())}, " +
+            f"{self.id}, {self._pollutant}, {self.reach}, " +
-            f"{self._pollutant}, {self.reach}, " +
             f"{self._begin_rk}, {self._end_rk}" +
             f"{self._status.scenario_id}" +
             ")"

src/Model/LateralContributionsAdisTS/LateralContributionsAdisTSList.py

@@ -19,7 +19,7 @@
 from copy import copy
 from tools import trace, timer
 
-from Model.Tools.PamhyrListExt import PamhyrModelList
+from Model.Tools.PamhyrList import PamhyrModelList
 from Model.Except import NotImplementedMethodeError
 
 from Model.LateralContributionsAdisTS.LateralContributionAdisTS \

src/Model/OutputRKAdists/OutputRKAdists.py

@@ -77,18 +77,17 @@ class OutputRKAdists(SQLSubModel):
 
     @classmethod
     def _db_create(cls, execute, ext=""):
-        execute(f"""
+        execute(
-          CREATE TABLE  output_rk_adists{ext}(
+            f"CREATE TABLE  output_rk_adists{ext}(" +
-            {cls.create_db_add_pamhyr_id()},
+            f"{cls.create_db_add_pamhyr_id()},"
-            deleted BOOLEAN NOT NULL DEFAULT FALSE,
+            "reach INTEGER NOT NULL, " +
-            reach INTEGER NOT NULL,
+            "rk REAL NOT NULL, " +
-            rk REAL NOT NULL,
+            "title TEXT NOT NULL, " +
-            title TEXT NOT NULL,
+            f"{Scenario.create_db_add_scenario()},"
-            {Scenario.create_db_add_scenario()},
+            f"{Scenario.create_db_add_scenario_fk()},"
-            {Scenario.create_db_add_scenario_fk()},
+            "FOREIGN KEY(reach) REFERENCES river_reach(id)" +
-            FOREIGN KEY(reach) REFERENCES river_reach(id)
+            ")"
-          )
+        )
-        """)
 
         return cls._create_submodel(execute)
 
@@ -145,7 +144,7 @@ class OutputRKAdists(SQLSubModel):
             return new
 
         table = execute(
-            "SELECT pamhyr_id, deleted, reach, rk, title, scenario " +
+            "SELECT pamhyr_id, reach, rk, title, scenario " +
             f"FROM  output_rk_adists"
         )
 
@@ -154,7 +153,6 @@ class OutputRKAdists(SQLSubModel):
                 it = iter(row)
 
                 pid = next(it)
-                deleted = (next(it) == 1)
                 id_reach = next(it)
                 id_rk = next(it)
                 title = next(it)
@@ -166,8 +164,6 @@ class OutputRKAdists(SQLSubModel):
                     status=status,
                     owner_scenario=owner_scenario,
                 )
-                if deleted:
-                    new_output.set_as_deleted()
 
                 loaded.add(pid)
                 new.append(new_output)
@@ -190,11 +186,9 @@ class OutputRKAdists(SQLSubModel):
 
         execute(
             "INSERT INTO " +
-            "output_rk_adists(pamhyr_id, deleted, " +
+            "output_rk_adists(pamhyr_id, reach, rk, title, scenario) " +
-            "reach, rk, title, scenario) " +
             "VALUES (" +
-            f"{self.id}, {self._db_format({self.is_deleted()})}" +
+            f"{self.id}, {self._reach}, {self._rk}, " +
-            f"{self._reach}, {self._rk}, " +
             f"'{self._db_format(self._title)}'" +
             f"{self._status.scenario_id}" +
             ")"

src/Model/OutputRKAdists/OutputRKListAdists.py

@@ -19,7 +19,7 @@
 from tools import trace, timer
 
 from Model.Except import NotImplementedMethodeError
-from Model.Tools.PamhyrListExt import PamhyrModelList
+from Model.Tools.PamhyrList import PamhyrModelList
 from Model.OutputRKAdists.OutputRKAdists import OutputRKAdists