parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Solver: Mage: Fix ST file name.

setup.py
Pierre-Antoine Rouby 2024-02-20 12:07:30 +01:00
parent 6b8b1b8e1e
commit a9f92637ca
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Solver/Mage.py
View File

@ -148,7 +148,7 @@ class Mage(CommandLineSolver):
) )
for edge in edges: for edge in edges:
name = f"Reach_{edge.id}" name = f"Reach_{edge.id + 1:>3}".replace(" ", "0")
with mage_file_open( with mage_file_open(
os.path.join(repertory, "net", f"{name}.ST"), os.path.join(repertory, "net", f"{name}.ST"),
@ -817,11 +817,8 @@ class Mage8(Mage):
) )
for e in edges: for e in edges:
name = e.name.replace(" ", "_") name = f"Reach_{e.id + 1:>3}".replace(" ", "0")
if e._name == "": id = name
name = f"Reach_{e.id}"
id = f"Bief_{e.id+1}"
n1 = f"{e.node1.id:3}".replace(" ", "x") n1 = f"{e.node1.id:3}".replace(" ", "x")
n2 = f"{e.node2.id:3}".replace(" ", "x") n2 = f"{e.node2.id:3}".replace(" ", "x")