correct fst networkx transitions

Author: bygu4

pyformlang/cfg/tests/test_terminal.py

@@ -24,6 +24,8 @@ def test_creation(self):
         assert epsilon.to_text() == "epsilon"
         assert Terminal("C").to_text() == '"TER:C"'
         assert repr(Epsilon()) == "epsilon"
+        assert str(terminal0) == "0"
+        assert repr(terminal0) == "Terminal(0)"
 
     def test_eq(self):
         assert "epsilon" == Epsilon()

pyformlang/cfg/tests/test_variable.py

@@ -20,3 +20,5 @@ def test_creation(self):
         assert str(variable0) == str(variable3)
         assert str(variable0) != str(variable1)
         assert "A" == Variable("A")
+        assert str(variable1) == "1"
+        assert repr(variable1) == "Variable(1)"

pyformlang/finite_automaton/finite_automaton.py

@@ -700,10 +700,10 @@ def __try_add(set_to_add_to: Set[Any], element_to_add: Any) -> bool:
     @staticmethod
     def __add_start_state_to_graph(graph: MultiDiGraph, state: State) -> None:
         """ Adds a starting node to a given graph """
-        graph.add_node("starting_" + str(state.value),
+        graph.add_node("starting_" + str(state),
                        label="",
                        shape=None,
                        height=.0,
                        width=.0)
-        graph.add_edge("starting_" + str(state.value),
+        graph.add_edge("starting_" + str(state),
                        state.value)

pyformlang/finite_automaton/tests/test_state.py

@@ -22,6 +22,7 @@ def test_repr(self):
         assert str(state1) == "ABC"
         state2 = State(1)
         assert str(state2) == "1"
+        assert repr(state1) == "State(ABC)"
 
     def test_eq(self):
         """ Tests the equality of states

pyformlang/finite_automaton/tests/test_symbol.py

@@ -22,6 +22,7 @@ def test_repr(self):
         assert str(symbol1) == "ABC"
         symbol2 = Symbol(1)
         assert str(symbol2) == "1"
+        assert repr(symbol2) == "Symbol(1)"
 
     def test_eq(self):
         """ Tests equality of symbols

pyformlang/fst/fst.py

@@ -2,7 +2,6 @@
 
 from typing import Dict, List, Set, Tuple, Iterator, Iterable, Hashable
 from copy import deepcopy
-from json import dumps, loads
 
 from networkx import MultiDiGraph
 from networkx.drawing.nx_pydot import write_dot
@@ -417,26 +416,26 @@ def to_networkx(self) -> MultiDiGraph:
         """
         graph = MultiDiGraph()
         for state in self._states:
-            graph.add_node(state,
+            graph.add_node(state.value,
                            is_start=state in self.start_states,
                            is_final=state in self.final_states,
                            peripheries=2 if state in self.final_states else 1,
-                           label=state)
+                           label=state.value)
             if state in self.start_states:
                 graph.add_node("starting_" + str(state),
                                label="",
                                shape=None,
                                height=.0,
                                width=.0)
                 graph.add_edge("starting_" + str(state),
-                               state)
-        for s_from, input_symbol in self._delta:
-            for s_to, output_symbols in self._delta[(s_from, input_symbol)]:
-                graph.add_edge(
-                    s_from,
-                    s_to,
-                    label=(dumps(input_symbol) + " -> " +
-                           dumps(output_symbols)))
+                               state.value)
+        for (s_from, input_symbol), (s_to, output_symbols) in self:
+            input_symbol = input_symbol.value
+            output_symbols = tuple(map(lambda x: x.value, output_symbols))
+            graph.add_edge(
+                s_from.value,
+                s_to.value,
+                label=(input_symbol, output_symbols))
         return graph
 
     @classmethod
@@ -465,10 +464,8 @@ def from_networkx(cls, graph: MultiDiGraph) -> "FST":
             for s_to in graph[s_from]:
                 for transition in graph[s_from][s_to].values():
                     if "label" in transition:
-                        in_symbol, out_symbols = transition["label"].split(
-                            " -> ")
-                        in_symbol = loads(in_symbol)
-                        out_symbols = loads(out_symbols)
+                        label = transition["label"]
+                        in_symbol, out_symbols = label
                         fst.add_transition(s_from,
                                            in_symbol,
                                            s_to,

pyformlang/fst/tests/test_fst.py

@@ -179,12 +179,14 @@ def test_paper(self):
              (2, "alone", 3, ["seul"])])
         fst.add_start_state(0)
         fst.add_final_state(3)
-        assert list(fst.translate(["I", "am", "alone"])) == \
-            [['Je', 'suis', 'seul'],
-             ['Je', 'suis', 'tout', 'seul']]
+        translation = list(fst.translate(["I", "am", "alone"]))
+        assert ['Je', 'suis', 'seul'] in translation
+        assert ['Je', 'suis', 'tout', 'seul'] in translation
+        assert len(translation) == 2
         fst = FST.from_networkx(fst.to_networkx())
-        assert list(fst.translate(["I", "am", "alone"])) == \
-            [['Je', 'suis', 'seul'],
-             ['Je', 'suis', 'tout', 'seul']]
+        translation = list(fst.translate(["I", "am", "alone"]))
+        assert ['Je', 'suis', 'seul'] in translation
+        assert ['Je', 'suis', 'tout', 'seul'] in translation
+        assert len(translation) == 2
         fst.write_as_dot("fst.dot")
         assert path.exists("fst.dot")

pyformlang/indexed_grammar/duplication_rule.py

@@ -96,5 +96,5 @@ def __eq__(self, other: Any) -> bool:
 
     def __repr__(self) -> str:
         """Gives a string representation of the rule, ignoring the sigmas"""
-        return f"{self._left_term} -> \
-            {self._right_terms[0]} {self._right_terms[1]}"
+        return f"{self._left_term} -> " \
+            + f"{self._right_terms[0]} {self._right_terms[1]}"

pyformlang/indexed_grammar/tests/test_rules.py

@@ -41,7 +41,7 @@ def test_production_rules(self):
         """ Tests the production rules """
         produ = ProductionRule("S", "C", "end")
         assert produ.terminals == {"end"}
-        assert str(produ) == "S -> C[ end ]"
+        assert str(produ) == "S -> C [ end ]"
 
     def test_rules(self):
         """ Tests the rules """

pyformlang/pda/pda.py

@@ -789,12 +789,12 @@ def __copy__(self) -> "PDA":
     def __add_start_state_to_graph(graph: MultiDiGraph,
                                    state: State) -> None:
         """ Adds a starting node to a given graph """
-        graph.add_node("starting_" + str(state.value),
+        graph.add_node("starting_" + str(state),
                     label="",
                     shape=None,
                     height=.0,
                     width=.0)
-        graph.add_edge("starting_" + str(state.value),
+        graph.add_edge("starting_" + str(state),
                     state.value)
 
     @staticmethod