adistslc => adistswc

src/Solver/AdisTS.py

@@ -178,17 +178,17 @@ class AdisTS(CommandLineSolver):
 #################################
 
 
-class AdisTSlc(AdisTS):
-    _type = "adistslc"
+class AdisTSwc(AdisTS):
+    _type = "adistswc"
 
     def __init__(self, name):
-        super(AdisTSlc, self).__init__(name)
+        super(AdisTSwc, self).__init__(name)
 
-        self._type = "adistslc"
+        self._type = "adistswc"
 
     @classmethod
     def default_parameters(cls):
-        lst = super(AdisTSlc, cls).default_parameters()
+        lst = super(AdisTSwc, cls).default_parameters()
 
         # Insert new parameters at specific position
         names = list(map(lambda t: t[0], lst))
@@ -200,7 +200,7 @@ class AdisTSlc(AdisTS):
     ##########
 
     def cmd_args(self, study):
-        lst = super(AdisTSlc, self).cmd_args(study)
+        lst = super(AdisTSwc, self).cmd_args(study)
 
         return lst
 
@@ -505,8 +505,8 @@ class AdisTSlc(AdisTS):
                 r = results.river.add(i)
                 reachs.append(r)
 
-                is1[i] = data[2 * i] - 1 # first section of reach i (FORTRAN numbering)
-                is2[i] = data[2 * i + 1] - 1  # last section of reach i (FORTRAN numbering)
+                is1[i] = data[2 * i] - 1 # first section of reach i
+                is2[i] = data[2 * i + 1] - 1  # last section of reach i
 
                 key = (is1[i], is2[i])
                 iprofiles[key] = r
@@ -544,14 +544,15 @@ class AdisTSlc(AdisTS):
                     data = np.fromfile(f, dtype=np.int32, count=1)  # line length (bytes) (end)
                 # end header
 
-        def ip_to_r(i): return iprofiles[
-            next(
-                filter(
-                    lambda k: k[0] <= i <= k[1],
-                    iprofiles
+        def ip_to_r(i):
+            return iprofiles[
+                next(
+                    filter(
+                        lambda k: k[0] <= i <= k[1],
+                        iprofiles
+                    )
                 )
-            )
-        ]
+            ]
 
         def ip_to_ri(r, i): return i - reach_offset[r]
 
@@ -680,7 +681,7 @@ class AdisTSlc(AdisTS):
         if name is None:
             name = study.name.replace(" ", "_")
 
-        results = super(AdisTSlc, self).results(study, repertory, qlog, name=name)
+        results = super(AdisTSwc, self).results(study, repertory, qlog, name=name)
 
         return results
 
@@ -694,7 +695,7 @@ class AdisTSlc(AdisTS):
 
     @timer
     def export(self, study, repertory, mage_rep, qlog=None, name="0"):
-        print("cmd solver adistslc : ", self._cmd_solver)
+        print("cmd solver adistswc : ", self._cmd_solver)
         self._study = study
         name = study.name.replace(" ", "_")
 

src/Solver/Solvers.py

@@ -22,7 +22,7 @@ from Solver.GenericSolver import GenericSolver
 from Solver.Mage import (
     Mage7, Mage8, MageFake7,
 )
-from Solver.AdisTS import AdisTSlc
+from Solver.AdisTS import AdisTSwc
 from Solver.RubarBE import Rubar3, RubarBE
 
 _translate = QCoreApplication.translate
@@ -32,7 +32,7 @@ solver_long_name = {
     # "mage7": "Mage v7",
     "mage8": "Mage v8",
     # "mage_fake7": "Mage fake v7",
-    "adistslc": "Adis-TS_LC",
+    "adistswc": "Adis-TS_WC",
     # "rubarbe": "RubarBE",
     # "rubar3": "Rubar3",
 }
@@ -42,7 +42,7 @@ solver_type_list = {
     # "mage7": Mage7,
     "mage8": Mage8,
     # "mage_fake7": MageFake7,
-    "adistslc": AdisTSlc,
+    "adistswc": AdisTSwc,
     # "rubarbe": RubarBE,
     # "rubar3": Rubar3,
 }

src/View/MainWindow.py

@@ -1290,8 +1290,8 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
         if self._study is None:
             return
 
-        #solver = next(filter(lambda x: x._type == "adistslc", self.conf.solvers))
-        #solver = next(filter(lambda x: x.name == "AdisTS-LC", self.conf.solvers))
+        #solver = next(filter(lambda x: x._type == "adistswc", self.conf.solvers))
+        #solver = next(filter(lambda x: x.name == "AdisTS-WC", self.conf.solvers))
         #print(solver._type)
         #self.run_solver(solver)