add loading and make_input_complete for NonDetMooreMachines

Author: emuskardin

aalpy/utils/FileHandler.py

@@ -7,7 +7,7 @@
 
 from aalpy.automata import Dfa, MooreMachine, Mdp, Onfsm, MealyState, DfaState, MooreState, MealyMachine, \
     MdpState, StochasticMealyMachine, StochasticMealyState, OnfsmState, MarkovChain, McState, Sevpa, SevpaState, \
-    SevpaTransition, Vpa, VpaState, VpaTransition, NDMooreMachine
+    SevpaTransition, Vpa, VpaState, VpaTransition, NDMooreMachine, NDMooreState
 
 file_types = ['dot', 'png', 'svg', 'pdf', 'string']
 automaton_types = {Dfa: 'dfa', MealyMachine: 'mealy', MooreMachine: 'moore', Mdp: 'mdp',
@@ -238,6 +238,8 @@ def _process_label(label, source, destination, automaton_type):
         inp = int(inp) if inp.isdigit() else inp
         out = int(out) if out.isdigit() else out
         source.transitions[inp].append((out, destination))
+    if automaton_type == 'ndmoore':
+        source.transitions[int(label) if label.isdigit() else label].append(destination)
     if automaton_type == 'mc':
         prob = label
         source.transitions.append((destination, float(prob)))
@@ -317,7 +319,7 @@ def _process_node_label_prime(node_name, label, line, node_label_dict, node_type
     if automaton_type == 'mdp' or automaton_type == 'mc':
         node_label_dict[node_name] = node_type(node_name, label)
     else:
-        if automaton_type == 'moore' and label != "":
+        if automaton_type in {'moore', 'ndmoore'} and label != "":
             label_output = _strip_label(label)
             if "|" in label_output:
                 label, output = label_output.split("|", maxsplit=1)
@@ -349,7 +351,8 @@ def load_automaton_from_file(path, automaton_type, compute_prefixes=False):
 
         path: pathlike or str to the file
 
-        automaton_type: type of the automaton, one of ['dfa', 'mealy', 'moore', 'mdp', 'smm', 'onfsm', 'mc', 'sevpa']
+        automaton_type: type of the automaton, one of ['dfa', 'mealy', 'moore', 'mdp', 'smm',
+                        'onfsm', 'ndmoore', 'mc', 'sevpa', 'vpa']
 
         compute_prefixes: it True, shortest path to reach every state will be computed and saved in the prefix of
             the state. Useful when loading the model to use them as a equivalence oracle. (Default value = False)
@@ -364,7 +367,7 @@ def load_automaton_from_file(path, automaton_type, compute_prefixes=False):
     id_node_aut_map = {'dfa': (DfaState, Dfa), 'mealy': (MealyState, MealyMachine), 'moore': (MooreState, MooreMachine),
                        'onfsm': (OnfsmState, Onfsm), 'mdp': (MdpState, Mdp), 'mc': (McState, MarkovChain),
                        'smm': (StochasticMealyState, StochasticMealyMachine), 'sevpa': (SevpaState, Sevpa),
-                       'vpa': (VpaState, Vpa)}
+                       'vpa': (VpaState, Vpa), 'ndmoore': (NDMooreState, NDMooreMachine)}
 
     nodeType, aut_type = id_node_aut_map[automaton_type]
 

aalpy/utils/HelperFunctions.py

@@ -235,7 +235,7 @@ def make_input_complete(automaton, missing_transition_go_to='self_loop'):
     """
     from aalpy.base import DeterministicAutomaton
     from aalpy.automata import Dfa, MooreState, MealyMachine, Mdp, StochasticMealyMachine, Onfsm, \
-        DfaState, MealyState, MooreMachine, OnfsmState, MdpState, StochasticMealyState
+        DfaState, MealyState, MooreMachine, OnfsmState, MdpState, StochasticMealyState, NDMooreMachine, NDMooreState
 
     assert missing_transition_go_to in {'self_loop', 'sink_state'}
 
@@ -249,6 +249,7 @@ def make_input_complete(automaton, missing_transition_go_to='self_loop'):
                             MooreMachine: MooreState(state_id='sink', output='sink_state'),
                             MealyMachine: MealyState(state_id='sink'),
                             Onfsm: OnfsmState(state_id='sink'),
+                            NDMooreMachine: NDMooreState(state_id='sink'),
                             Mdp: MdpState(state_id='sink', output='sink_state'),
                             StochasticMealyMachine: StochasticMealyState(state_id='sink')}
 
@@ -259,31 +260,19 @@ def make_input_complete(automaton, missing_transition_go_to='self_loop'):
     for state in automaton.states:
         for i in input_al:
             if i not in state.transitions.keys():
-                if missing_transition_go_to == 'self_loop':
-                    if isinstance(automaton, DeterministicAutomaton):
-                        state.transitions[i] = state
-                        if isinstance(automaton, MealyMachine):
-                            state.output_fun[i] = 'epsilon'
-                    if isinstance(automaton, Onfsm):
-                        state.transitions[i].append(('epsilon', state))
-                    if isinstance(automaton, Mdp):
-                        state.transitions[i].append((state, 1.))
-                    if isinstance(automaton, StochasticMealyMachine):
-                        state.transitions[i].append((state, 'epsilon', 1.))
-                else:
-                    if isinstance(automaton, Dfa):
-                        state.transitions[i] = sink_state
-                    if isinstance(automaton, MooreMachine):
-                        state.transitions[i] = sink_state
+                target_state = state if missing_transition_go_to == 'self_loop' else sink_state
+
+                if isinstance(automaton, (DeterministicAutomaton, Dfa, MooreMachine, MealyMachine)):
+                    state.transitions[i] = target_state
                     if isinstance(automaton, MealyMachine):
-                        state.transitions[i] = sink_state
                         state.output_fun[i] = 'epsilon'
-                    if isinstance(automaton, Onfsm):
-                        state.transitions[i].append(('epsilon', sink_state))
-                    if isinstance(automaton, Mdp):
-                        state.transitions[i].append((sink_state, 1.))
-                    if isinstance(automaton, StochasticMealyMachine):
-                        state.transitions[i].append((sink_state, 'epsilon', 1.))
+                elif isinstance(automaton, (Onfsm, NDMooreMachine)):
+                    state.transitions[i].append(('epsilon', target_state) if
+                                                isinstance(automaton, Onfsm) else target_state)
+                elif isinstance(automaton, Mdp):
+                    state.transitions[i].append((target_state, 1.))
+                elif isinstance(automaton, StochasticMealyMachine):
+                    state.transitions[i].append((target_state, 'epsilon', 1.))
 
     return automaton