Merge branch 'scenarios' of gitlab.com:pamhyr/pamhyr2 into scenarios

This commit is contained in:
Theophile Terraz committed 2025-10-31 09:38:15 +01:00
commit 8bd791b2c4
15 files changed
+654 -249

No files matched your search

+6 -4
View File
@@ -177,15 +177,15 @@ class Mage(CommandLineSolver):
return lst
def input_param(self):
name = self._study.name
name = self._study.name.replace(" ", "_")
return f"{name}.REP"
def output_param(self):
name = self._study.name
name = self._study.name.replace(" ", "_")
return f"{name}.BIN"
def log_file(self):
name = self._study.name
name = self._study.name.replace(" ", "_")
return f"{name}.TRA"
def _export_REP_additional_lines(self, study, rep_file):
@@ -819,7 +819,8 @@ class Mage(CommandLineSolver):
repertory=repertory,
name=name,
)
fname = os.path.join(repertory, f"{name}.BIN")
fname = os.path.join(repertory, f"{name}.BIN".replace(" ", "_"))
if not os.path.isfile(fname):
logger.info(f"Result file {name}.BIN does not exist")
return None
@@ -1374,6 +1375,7 @@ class Mage8(Mage):
results = super(Mage8, self).results(study, repertory, qlog, name=name)
if results is None:
return None
if with_gra:
self.read_gra(study, repertory, results, qlog, name=name)