From 505d1aeb485bb832f12c4c734010a387be9dbb98 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Wed, 18 Oct 2023 16:40:28 +0200
Subject: [PATCH] Solver: Add @output command line parameters.
---
src/Solver/ASolver.py | 9 +++++++++
src/Solver/Mage.py | 4 ++++
2 files changed, 13 insertions(+)
diff --git a/src/Solver/ASolver.py b/src/Solver/ASolver.py
index 9d84fefb..0603a5ab 100644
--- a/src/Solver/ASolver.py
+++ b/src/Solver/ASolver.py
@@ -179,6 +179,14 @@ class AbstractSolver(object):
"""
raise NotImplementedMethodeError(self, self.input_param)
+ def output_param(self):
+ """Return output command line parameter(s)
+
+ Returns:
+ Returns output parameter(s) string
+ """
+ raise NotImplementedMethodeError(self, self.output_param)
+
def log_file(self):
"""Return log file name
@@ -222,6 +230,7 @@ class AbstractSolver(object):
cmd = cmd.replace("@install_dir", self._install_dir())
cmd = cmd.replace("@path", path.replace(" ", "%20"))
cmd = cmd.replace("@input", self.input_param())
+ cmd = cmd.replace("@output", self.output_param())
cmd = cmd.replace("@dir", self._process.workingDirectory())
cmd = cmd.replace("@args", " ".join(self.cmd_args(study)))
diff --git a/src/Solver/Mage.py b/src/Solver/Mage.py
index f0df6e95..57225882 100644
--- a/src/Solver/Mage.py
+++ b/src/Solver/Mage.py
@@ -109,6 +109,10 @@ class Mage(AbstractSolver):
name = self._study.name
return f"{name}.REP"
+ def output_param(self):
+ name = self._study.name
+ return f"{name}.BIN"
+
def log_file(self):
name = self._study.name
return f"{name}.TRA"
--
GitLab