add default rubar3 in config

scenarios Test_scenarios4
Theophile Terraz 2026-01-30 12:00:19 +01:00
parent 3e92a0c40d
commit 1db1a543c7
2 changed files with 34 additions and 5 deletions

View File

@ -169,9 +169,8 @@ class Rubar3(CommandLineSolver):
it = iter(params) it = iter(params)
line = 0 param = next(it, None)
while line < 27: while param != None:
param = next(it)
name = param.name name = param.name
value = param.value value = param.value
@ -204,7 +203,7 @@ class Rubar3(CommandLineSolver):
# New line # New line
f.write(f"\n") f.write(f"\n")
line += 1 param = next(it, None)
def _export_ts(self, study, repertory, qlog, name="0"): def _export_ts(self, study, repertory, qlog, name="0"):
if qlog is not None: if qlog is not None:

View File

@ -37,7 +37,7 @@ logger = logging.getLogger()
class Config(SQL): class Config(SQL):
def __init__(self): def __init__(self):
self._version = '0.0.6' self._version = '0.0.7'
self.filename = Config.filename() self.filename = Config.filename()
self.set_default_value() self.set_default_value()
@ -165,6 +165,29 @@ class Config(SQL):
"WHERE name='default-AdisTS'" "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( self.execute(
f"UPDATE info SET value='{self._version}' " + f"UPDATE info SET value='{self._version}' " +
"WHERE key='version'" "WHERE key='version'"
@ -337,6 +360,13 @@ class Config(SQL):
new._cmd_solver = f""""@install_dir/adists/adists{ext}" @args @input""" new._cmd_solver = f""""@install_dir/adists/adists{ext}" @args @input"""
self._solvers.append(new) 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 # Mage fake 7
# ctor = solver_type_list["mage_fake7"] # ctor = solver_type_list["mage_fake7"]
# new = ctor("default-mage-fake-7") # new = ctor("default-mage-fake-7")