Fix to_state_setup() with unreachable states

DES-Lab · Oct 21, 2024 · cc30abb · cc30abb
1 parent 9e9edcd
commit cc30abb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/aalpy/automata/Dfa.py b/aalpy/automata/Dfa.py
@@ -54,7 +54,7 @@ def to_state_setup(self):
         # ensure prefixes are computed
         self.compute_prefixes()
 
-        sorted_states = sorted(self.states, key=lambda x: len(x.prefix))
+        sorted_states = sorted(self.states, key=lambda x: len(x.prefix) if x.prefix is not None else len(self.states))
         for s in sorted_states:
             state_setup_dict[s.state_id] = (s.is_accepting, {k: v.state_id for k, v in s.transitions.items()})
 

diff --git a/aalpy/automata/MealyMachine.py b/aalpy/automata/MealyMachine.py
@@ -42,7 +42,7 @@ def to_state_setup(self):
         # ensure prefixes are computed
         self.compute_prefixes()
 
-        sorted_states = sorted(self.states, key=lambda x: len(x.prefix))
+        sorted_states = sorted(self.states, key=lambda x: len(x.prefix) if x.prefix is not None else len(self.states))
         for s in sorted_states:
             state_setup_dict[s.state_id] = {k: (s.output_fun[k], v.state_id) for k, v in s.transitions.items()}
 

diff --git a/aalpy/automata/MooreMachine.py b/aalpy/automata/MooreMachine.py
@@ -54,7 +54,7 @@ def to_state_setup(self):
         # ensure prefixes are computed
         self.compute_prefixes()
 
-        sorted_states = sorted(self.states, key=lambda x: len(x.prefix))
+        sorted_states = sorted(self.states, key=lambda x: len(x.prefix) if x.prefix is not None else len(self.states))
         for s in sorted_states:
             state_setup_dict[s.state_id] = (s.output, {k: v.state_id for k, v in s.transitions.items()})
 

diff --git a/aalpy/automata/Vpa.py b/aalpy/automata/Vpa.py
@@ -156,7 +156,7 @@ def to_state_setup(self):
         # ensure prefixes are computed
         # self.compute_prefixes()
 
-        sorted_states = sorted(self.states, key=lambda x: len(x.prefix))
+        sorted_states = sorted(self.states, key=lambda x: len(x.prefix) if x.prefix is not None else len(self.states))
         for s in sorted_states:
             state_setup_dict[s.state_id] = (
                 s.is_accepting, {k: (v.target_state.state_id, v.action) for k, v in s.transitions.items()})