From b171eb7d32ce75dfadb8df77458db1a690b627e4 Mon Sep 17 00:00:00 2001
From: Youcef AOUAD <youcef.aouad@inrae.fr>
Date: Thu, 27 Jun 2024 15:46:27 +0200
Subject: [PATCH] Solver connect
---
src/Solver/AdisTS.py | 8 ++++++--
src/Solver/CommandLine.py | 7 +++++++
src/View/MainWindow.py | 7 ++++++-
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/Solver/AdisTS.py b/src/Solver/AdisTS.py
index 96c7e423..c8da55a7 100644
--- a/src/Solver/AdisTS.py
+++ b/src/Solver/AdisTS.py
@@ -111,6 +111,7 @@ class AdisTS(CommandLineSolver):
rep_file.write(line.line)
def _export_REP(self, study, repertory, files, qlog, name="0"):
+
if qlog is not None:
qlog.put("Export REP file")
@@ -120,7 +121,9 @@ class AdisTS(CommandLineSolver):
repertory, f"{name}.REP"
), "w+"
) as f:
- f.write("confirmation=non\n")
+
+ f.write(f"NET ../default-mage/{name}.NET\n")
+ f.write(f"REP ../default-mage/{name}.REP\n")
for file in files:
EXT = file.split('.')[1]
@@ -168,6 +171,7 @@ class AdisTSlc(AdisTS):
super(AdisTSlc, self).__init__(name)
self._type = "adistslc"
+ print("cmd solver adistslc : ", self._cmd_solver)
@classmethod
def default_parameters(cls):
@@ -450,9 +454,9 @@ class AdisTSlc(AdisTS):
self._export_POLs,
]
-
@timer
def export(self, study, repertory, qlog=None, name="0"):
+ print("cmd solver adistslc : ", self._cmd_solver)
self._study = study
name = study.name.replace(" ", "_")
diff --git a/src/Solver/CommandLine.py b/src/Solver/CommandLine.py
index 5f706d1a..89e53b34 100644
--- a/src/Solver/CommandLine.py
+++ b/src/Solver/CommandLine.py
@@ -238,6 +238,8 @@ class CommandLineSolver(AbstractSolver):
cmd = self._cmd_solver
exe, args = self._format_command(study, cmd, self._path_solver)
+ print("parsed cmd solver exe : ", exe)
+ print("parsed cmd solver args : ", args)
if not os.path.exists(exe):
error = f"[ERROR] Path {exe} do not exists"
@@ -308,6 +310,11 @@ class CommandLineSolver(AbstractSolver):
self._output.put(res)
def run(self, study, process=None, output_queue=None):
+ print("Run debug")
+ print("---------")
+ print("cmd input : ", self._cmd_input)
+ print("cmd solver : ", self._cmd_solver)
+ print("cmd output : ", self._cmd_output)
self._study = study
# Replace old values if needed
diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py
index f005ba5c..7fdf5de2 100644
--- a/src/View/MainWindow.py
+++ b/src/View/MainWindow.py
@@ -1261,7 +1261,12 @@ 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._type == "adistslc", self.conf.solvers))
+ solver = next(filter(lambda x: x.name == "AdisTS-LC", self.conf.solvers))
+ print("solvers list : ", self.conf.solvers)
+ print("run solver adists : ", solver._cmd_solver)
+ print("solver adistslc cmd from list : ", self.conf.solvers[1]._cmd_solver)
+ print("solver mage cmd from list : ", self.conf.solvers[0]._cmd_solver)
self.run_solver(solver)
def run_solver(self, solver):
--
GitLab