diff --git a/adists/adists b/adists/adists new file mode 100755 index 0000000000000000000000000000000000000000..114beafa7a4f5688063d95d3f87ee7ef1c2cfd2a Binary files /dev/null and b/adists/adists differ diff --git a/src/Solver/AdisTS.py b/src/Solver/AdisTS.py index c8da55a78d334e36412ecaa2b581598eef35609d..1a69cdbd8f8ab15b365789ca056faf19053b8d27 100644 --- a/src/Solver/AdisTS.py +++ b/src/Solver/AdisTS.py @@ -159,6 +159,10 @@ class AdisTS(CommandLineSolver): return results + def output_param(self): + name = "" + return f"{name}" + ################################ # Adis-TS in low coupling mode # ################################ @@ -171,7 +175,6 @@ class AdisTSlc(AdisTS): super(AdisTSlc, self).__init__(name) self._type = "adistslc" - print("cmd solver adistslc : ", self._cmd_solver) @classmethod def default_parameters(cls): diff --git a/src/Solver/CommandLine.py b/src/Solver/CommandLine.py index 89e53b34a581d85738b04b6bb42753ee0addedb1..5a2343a70aca8494c56fe4838d4ed49a79e3b082 100644 --- a/src/Solver/CommandLine.py +++ b/src/Solver/CommandLine.py @@ -196,11 +196,17 @@ class CommandLineSolver(AbstractSolver): The executable and list of arguments """ cmd = cmd.replace("@install_dir", self._install_dir()) + print("format command installDir :", self._install_dir()) cmd = cmd.replace("@path", "\"" + path + "\"") + print("format command path :", path) cmd = cmd.replace("@input", self.input_param().replace(" ", "_")) + print("format command input :", self.input_param().replace(" ", "_")) cmd = cmd.replace("@output", self.output_param()) + print("format command output :", self.output_param()) cmd = cmd.replace("@dir", self._process.workingDirectory()) + print("format command dir :", self._process.workingDirectory()) cmd = cmd.replace("@args", " ".join(self.cmd_args(study))) + print("format command args :", " ".join(self.cmd_args(study))) logger.debug(f"! {cmd}") @@ -237,6 +243,8 @@ class CommandLineSolver(AbstractSolver): return True cmd = self._cmd_solver + print("run solver commandline cmd : ", cmd) + print("path solver : ", self._path_solver) exe, args = self._format_command(study, cmd, self._path_solver) print("parsed cmd solver exe : ", exe) print("parsed cmd solver args : ", args) diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py index 7fdf5de243187636f030e030ae65ea932e83cd9d..558131cb80744a1a3ba90029b7907e5cfa7b7b53 100644 --- a/src/View/MainWindow.py +++ b/src/View/MainWindow.py @@ -1263,10 +1263,6 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): #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): diff --git a/src/config.py b/src/config.py index 1209cc1686291210dc09661df1758809396446bc..71b85a979221e47c7125f38d89776432b2298cf6 100644 --- a/src/config.py +++ b/src/config.py @@ -41,6 +41,7 @@ class Config(SQL): self.filename = Config.filename() self.set_default_value() + logging.info(f"Configuration file : {self.filename}") super(Config, self).__init__(filename=self.filename) diff --git a/tests_cases/Enlargement/Enlargement.pamhyr b/tests_cases/Enlargement/Enlargement.pamhyr index 45c153f4f775b86e041fe26b3c9660f46ce56472..c2c49f7d14fad138c40a9adf02ba7aaf61914a5a 100644 Binary files a/tests_cases/Enlargement/Enlargement.pamhyr and b/tests_cases/Enlargement/Enlargement.pamhyr differ