parouby/Pamhyr2
1
0 Fork 0
mirror of https://gitlab.com/pamhyr/pamhyr2.git synced 2026-10-30 03:20:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scenarios: Merge branch 'master' into scenarios.

Browse Source
This commit is contained in:
parouby committed 2026-06-04 14:03:49 +02:00
2 parents e86b84b0b9 0a0eeb3c3f
commit 0f6709075f
25 files changed
+597 -122
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/config.py
+24 -8
View File
@@ -101,6 +101,7 @@ class Config(SQL):
# Add default solver
posix = os.name == 'posix'
ext = "" if posix else ".exe"
path = os.path.join("@install_dir", "mage8", f"mage{ext}")
self.execute(f"""
INSERT INTO solver VALUES (
@@ -111,7 +112,7 @@ class Config(SQL):
'', '', '',
'',
'@install_dir/mage/mage{ext} @args @input',
'{path} @args @input',
''
)
""")
@@ -135,16 +136,19 @@ class Config(SQL):
if int(release) < 5:
posix = os.name == 'posix'
ext = "" if posix else ".exe"
path = os.path.join("@install_dir", "mage8", f"mage{ext}")
self.execute(
"UPDATE solver SET cmd_solver=" +
f"'@install_dir/mage8/mage{ext} @args @input' "
f"'{path} @args @input' "
"WHERE name='default-mage'"
)
if int(release) < 6:
posix = os.name == 'posix'
ext = "" if posix else ".exe"
path = os.path.join("@install_dir",
"adists", f"adists{ext}")
self.execute(f"""
INSERT INTO solver VALUES (
@@ -155,19 +159,21 @@ class Config(SQL):
'', '', '',
'',
'@install_dir/adists/adists{ext} @args @input',
'{path} @args @input',
''
)
""")
self.execute(
"UPDATE solver SET cmd_solver=" +
f"'@install_dir/adists/adists{ext} @args @input' "
f"'{path} @args @input' "
"WHERE name='default-AdisTS'"
)
if int(release) < 7:
posix = os.name == 'posix'
ext = "" if posix else ".exe"
path = os.path.join("@install_dir",
"rubar", f"rubarbe{ext}")
self.execute(f"""
INSERT INTO solver VALUES (
@@ -178,13 +184,13 @@ class Config(SQL):
'', '', '',
'',
'@install_dir/rubar/rubar3{ext} @args @input',
'{path} @args @input',
''
)
""")
self.execute(
"UPDATE solver SET cmd_solver=" +
f"'@install_dir/rubar/rubar3{ext} @args @input' "
f"'{path} @args @input' "
"WHERE name='default-Rubar3'"
)
@@ -350,14 +356,24 @@ class Config(SQL):
ctor = solver_type_list["mage8"]
new = ctor("default-mage")
new._description = "Default Pamhyr2 mage 8 version"
new._cmd_solver = f""""@install_dir/mage8/mage{ext}" @args @input"""
path = os.path.join("@install_dir", "mage8", "mage")
new._cmd_solver = f""""{path}{ext}" @args @input"""
self._solvers.append(new)
# AdisTS
ctor = solver_type_list["adistswc"]
new = ctor("default-AdisTS")
new._description = "Default Pamhyr2 AdisTS version"
new._cmd_solver = f""""@install_dir/adists/adists{ext}" @args @input"""
path = os.path.join("@install_dir", "adists", "adists")
new._cmd_solver = f""""{path}{ext}" @args @input"""
self._solvers.append(new)
# Rubar3
ctor = solver_type_list["rubar3"]
new = ctor("default-Rubar3")
new._description = "Default Pamhyr2 Rubar 3 version"
path = os.path.join("@install_dir", "rubar", f"rubarbe{ext}")
new._cmd_solver = f""""{path}" @args @input"""
self._solvers.append(new)
# Rubar3