update tests, correct transition function of pda, correct CFGConvertible interface

Author: bygu4

pyformlang/cfg/tests/test_llone_parser.py

@@ -88,13 +88,13 @@ def test_get_follow_set2(self):
         cfg = CFG.from_text(text)
         llone_parser = LLOneParser(cfg)
         follow_set = llone_parser.get_follow_set()
-        assert follow_set["S"] == \
+        assert follow_set[Variable("S")] == \
                          {"$"}
-        assert follow_set["A"] == \
+        assert follow_set[Variable("A")] == \
                          {"$", Terminal("h"), Terminal("g")}
-        assert follow_set["B"] == \
+        assert follow_set[Variable("B")] == \
                          {"$", Terminal("h"), Terminal("g"), Terminal("a")}
-        assert follow_set["C"] == \
+        assert follow_set[Variable("C")] == \
                          {"$", Terminal("h"), Terminal("g"), Terminal("b")}
 
     def test_get_llone_table(self):

pyformlang/fcfg/fcfg.py

@@ -1,15 +1,15 @@
 """Feature Context-Free Grammar"""
 import string
-from typing import Iterable, AbstractSet, Union
-
-from objects.cfg_objects.utils import to_terminal
+from typing import Iterable, AbstractSet, Hashable
 
 from pyformlang.cfg import CFG, Terminal, Epsilon, Variable, ParseTree
 from pyformlang.cfg.cfg import is_special_text, EPSILON_SYMBOLS, NotParsableException
 from pyformlang.fcfg.feature_production import FeatureProduction
 from pyformlang.fcfg.feature_structure import FeatureStructure, FeatureStructuresNotCompatibleException
 from pyformlang.fcfg.state import State, StateProcessed
 
+from ..objects.cfg_objects.utils import to_terminal
+
 
 class FCFG(CFG):
     """ A class representing a feature context-free grammar
@@ -73,7 +73,7 @@ def __predictor(self, state, chart, processed):
                 if processed.add(end_idx, new_state):
                     chart[end_idx].append(new_state)
 
-    def contains(self, word: Iterable[Union[Terminal, str]]) -> bool:
+    def contains(self, word: Iterable[Hashable]) -> bool:
         """ Gives the membership of a word to the grammar
 
         Parameters
@@ -88,7 +88,7 @@ def contains(self, word: Iterable[Union[Terminal, str]]) -> bool:
         """
         return self._get_final_state(word) is not None
 
-    def get_parse_tree(self, word: Iterable[Union[Terminal, str]]) -> ParseTree:
+    def get_parse_tree(self, word: Iterable[Hashable]) -> ParseTree:
         """ Gives the parse tree for a sentence, if possible
 
         Parameters
@@ -111,7 +111,7 @@ def get_parse_tree(self, word: Iterable[Union[Terminal, str]]) -> ParseTree:
             raise NotParsableException()
         return final_state.parse_tree
 
-    def _get_final_state(self, word: Iterable[Terminal]):
+    def _get_final_state(self, word: Iterable[Hashable]):
         word = [to_terminal(x) for x in word if x != Epsilon()]
         chart = [[] for _ in range(len(word) + 1)]
         # Processed[i] contains all production rule that are currently working until i.

pyformlang/objects/cfg_objects/cfg_convertible.py

@@ -1,10 +1,11 @@
 """ Interface representing the ability of conversion to cfg object """
 
-from typing import Optional
+from typing import Optional, Any
 
 
 class CFGConvertible:
     """ Interface representing the ability of conversion to cfg object """
 
-    def __init__(self) -> None:
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
         self.index_cfg_converter: Optional[int] = None

pyformlang/objects/finite_automaton_objects/state.py

@@ -8,7 +8,7 @@
 from ..cfg_objects import CFGConvertible
 
 
-class State(FiniteAutomatonObject, CFGConvertible):
+class State(CFGConvertible, FiniteAutomatonObject):
     """ A state in a finite automaton
 
     Parameters

pyformlang/objects/pda_objects/stack_symbol.py

@@ -6,7 +6,7 @@
 from ..cfg_objects import CFGConvertible
 
 
-class StackSymbol(Symbol, CFGConvertible):
+class StackSymbol(CFGConvertible, Symbol):
     """ A StackSymbol in a pushdown automaton
 
     Parameters

pyformlang/objects/pda_objects/state.py

@@ -6,7 +6,7 @@
 from ..cfg_objects import CFGConvertible
 
 
-class State(PDAObject, CFGConvertible):
+class State(CFGConvertible, PDAObject):
     """ A State in a pushdown automaton
 
     Parameters

pyformlang/pda/tests/test_pda.py

@@ -5,7 +5,6 @@
 from pyformlang.cfg import Terminal
 from pyformlang.finite_automaton import DeterministicFiniteAutomaton
 from pyformlang.finite_automaton import State as FAState, Symbol as FASymbol
-from pyformlang.pda.utils import PDAObjectCreator
 from pyformlang.regular_expression import Regex
 
 
@@ -326,11 +325,6 @@ def test_intersection_regex(self):
         cfg = pda_es.to_cfg()
         assert not cfg
 
-    def test_pda_object_creator_epsilon(self):
-        """ Test creation objects """
-        poc = PDAObjectCreator()
-        assert poc.to_stack_symbol(Epsilon()) == Epsilon()
-
     def test_pda_paper(self):
         """ Code in the paper """
         pda = PDA()

pyformlang/pda/transition_function.py

@@ -1,12 +1,12 @@
 """ A transition function in a pushdown automaton """
 
 from copy import deepcopy
-from typing import Dict, List, Set, Iterator, Iterable, Tuple, Optional
+from typing import Dict, Set, Sequence, Iterator, Iterable, Tuple
 
 from ..objects.pda_objects import State, Symbol, StackSymbol
 
 TransitionKey = Tuple[State, Symbol, StackSymbol]
-TransitionValue = Tuple[State, List[StackSymbol]]
+TransitionValue = Tuple[State, Tuple[StackSymbol, ...]]
 TransitionValues = Set[TransitionValue]
 Transition = Tuple[TransitionKey, TransitionValue]
 
@@ -16,9 +16,6 @@ class TransitionFunction(Iterable[Transition]):
 
     def __init__(self) -> None:
         self._transitions: Dict[TransitionKey, TransitionValues] = {}
-        self._current_key: Optional[TransitionKey] = None
-        self._iter_key: Optional[Iterator[TransitionKey]] = None
-        self._iter_inside: Optional[Iterator[TransitionValue]] = None
 
     def get_number_transitions(self) -> int:
         """ Gets the number of transitions
@@ -36,7 +33,7 @@ def add_transition(self,
                        input_symbol: Symbol,
                        stack_from: StackSymbol,
                        s_to: State,
-                       stack_to: List[StackSymbol]) -> None:
+                       stack_to: Sequence[StackSymbol]) -> None:
         """ Add a transition to the function
 
         Parameters
@@ -53,7 +50,7 @@ def add_transition(self,
             The string of stack symbol which replace the stack_from
         """
         temp_in = (s_from, input_symbol, stack_from)
-        temp_out = (s_to, stack_to.copy())
+        temp_out = (s_to, tuple(stack_to))
         if temp_in in self._transitions:
             self._transitions[temp_in].add(temp_out)
         else:
@@ -71,7 +68,7 @@ def copy(self) -> "TransitionFunction":
         for temp_in, transition in self._transitions.items():
             for temp_out in transition:
                 new_tf.add_transition(temp_in[0], temp_in[1], temp_in[2],
-                                      temp_out[0], temp_out[1])
+                                      *temp_out)
         return new_tf
 
     def __iter__(self) -> Iterator[Transition]:

pyformlang/rsa/tests/test_rsa.py

@@ -1,5 +1,5 @@
 """ Tests for RSA """
-from pyformlang.finite_automaton.symbol import Symbol
+from pyformlang.finite_automaton import Symbol
 from pyformlang.regular_expression import Regex
 
 from pyformlang.rsa.recursive_automaton import RecursiveAutomaton