From a9903e987b00dbb44a1033cec5e7c748eacb6ffb Mon Sep 17 00:00:00 2001
From: Dylan Jeannin <dylanjeannin@gmail.com>
Date: Thu, 25 Jun 2026 14:05:04 +0200
Subject: [PATCH] AdisTS: Resolve bug with node ids not matching in config
 files

---
 src/Solver/AdisTS.py | 45 ++------------------------------------------
 1 file changed, 2 insertions(+), 43 deletions(-)

diff --git a/src/Solver/AdisTS.py b/src/Solver/AdisTS.py
index 76f063d3..309153a7 100644
--- a/src/Solver/AdisTS.py
+++ b/src/Solver/AdisTS.py
@@ -280,8 +280,8 @@ class AdisTS(CommandLineSolver):
                 name = f"Reach_{e.id + 1:>3}".replace(" ", "0")
                 id = name
 
-                n1 = f"{e.node1.id:3}".replace(" ", "x")
-                n2 = f"{e.node2.id:3}".replace(" ", "x")
+                n1 = f"{self.get_node_name(e.node1):3}".replace(" ", "x")
+                n2 = f"{self.get_node_name(e.node2):3}".replace(" ", "x")
                 file = os.path.join("net", name + ".ST")
 
                 f.write(f"{id} {n1} {n2} {file}\n")
@@ -455,47 +455,6 @@ class AdisTS(CommandLineSolver):
     def get_reach_name(self, reach):
         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 #
 #################################