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

AdisTS: Resolve bug with node ids not matching in config files

scenarios
Dylan Jeannin 2026-06-25 14:05:04 +02:00
parent 32cbc6bc3e
commit a9903e987b
1 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/Solver/AdisTS.py
View File

@ -280,8 +280,8 @@ class AdisTS(CommandLineSolver):
name = f"Reach_{e.id + 1:>3}".replace(" ", "0") name = f"Reach_{e.id + 1:>3}".replace(" ", "0")
id = name id = name
n1 = f"{e.node1.id:3}".replace(" ", "x") n1 = f"{self.get_node_name(e.node1):3}".replace(" ", "x")
n2 = f"{e.node2.id:3}".replace(" ", "x") n2 = f"{self.get_node_name(e.node2):3}".replace(" ", "x")
file = os.path.join("net", name + ".ST") file = os.path.join("net", name + ".ST")
f.write(f"{id} {n1} {n2} {file}\n") f.write(f"{id} {n1} {n2} {file}\n")
@ -455,47 +455,6 @@ class AdisTS(CommandLineSolver):
def get_reach_name(self, reach): def get_reach_name(self, reach):
return f"Reach_{reach.pamhyr_id:>3}".replace(" ", "0") return f"Reach_{reach.pamhyr_id:>3}".replace(" ", "0")
def get_node_name(self, node):
"""Generate a 3 char name for node
Args:
node: The node
Returns:
A 3 char name string
"""
n = node.pamhyr_id
# print("node name id: ", n)
# if n in self._nodes_names:
# return self._nodes_names[n]
name = ""
checked_new = False
while not checked_new:
self._nodes_cnt += 1
nc = self._nodes_cnt
name = "".join(
map(
lambda i: self._alph[i % self._l_alph],
[
int(nc / (self._l_alph * self._l_alph)),
int(nc / self._l_alph),
nc
]
)
)
checked_new = name not in self._nodes_views
self._nodes_views.add(name)
self._nodes_names[n] = name
return name
################################# #################################
# Adis-TS in weak coupling mode # # Adis-TS in weak coupling mode #
################################# #################################