From 1db1a543c76132c87fc2407624c999bf21ed62c0 Mon Sep 17 00:00:00 2001 From: Theophile Terraz Date: Fri, 30 Jan 2026 12:00:19 +0100 Subject: [PATCH] add default rubar3 in config --- src/Solver/RubarBE.py | 7 +++---- src/config.py | 32 +++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/src/Solver/RubarBE.py b/src/Solver/RubarBE.py index fe169f88..36b36a48 100644 --- a/src/Solver/RubarBE.py +++ b/src/Solver/RubarBE.py @@ -169,9 +169,8 @@ class Rubar3(CommandLineSolver): it = iter(params) - line = 0 - while line < 27: - param = next(it) + param = next(it, None) + while param != None: name = param.name value = param.value @@ -204,7 +203,7 @@ class Rubar3(CommandLineSolver): # New line f.write(f"\n") - line += 1 + param = next(it, None) def _export_ts(self, study, repertory, qlog, name="0"): if qlog is not None: diff --git a/src/config.py b/src/config.py index 07687a10..d84df734 100644 --- a/src/config.py +++ b/src/config.py @@ -37,7 +37,7 @@ logger = logging.getLogger() class Config(SQL): def __init__(self): - self._version = '0.0.6' + self._version = '0.0.7' self.filename = Config.filename() self.set_default_value() @@ -165,6 +165,29 @@ class Config(SQL): "WHERE name='default-AdisTS'" ) + if int(release) < 7: + posix = os.name == 'posix' + ext = "" if posix else ".exe" + + self.execute(f""" + INSERT INTO solver VALUES ( + 'rubar3', + 'default-Rubar3', + 'Default Pamhyr2 Rubar 3 version', + + '', '', '', + + '', + '@install_dir/rubar/rubar3{ext} @args @input', + '' + ) + """) + self.execute( + "UPDATE solver SET cmd_solver=" + + f"'@install_dir/rubar/rubar3{ext} @args @input' " + "WHERE name='default-Rubar3'" + ) + self.execute( f"UPDATE info SET value='{self._version}' " + "WHERE key='version'" @@ -337,6 +360,13 @@ class Config(SQL): new._cmd_solver = f""""@install_dir/adists/adists{ext}" @args @input""" self._solvers.append(new) + # Rubar3 + ctor = solver_type_list["rubar3"] + new = ctor("default-Rubar3") + new._description = "Default Pamhyr2 Rubar 3 version" + new._cmd_solver = f""""@install_dir/rubar/rubar3{ext}" @args @input""" + self._solvers.append(new) + # Mage fake 7 # ctor = solver_type_list["mage_fake7"] # new = ctor("default-mage-fake-7")