Remove pred from ARCTL.__init__

@@ -136,29 +136,28 @@ class CTL_model_checker(object):
 
 
 
 
 class ARCTL_model_checker(CTL_model_checker):
 class ARCTL_model_checker(CTL_model_checker):
-    def __init__ (self, universe, pred_dict, pred, tau_label="_None"):
+    def __init__ (self, universe, actions, tau_label="_None"):
         """
         """
         Input:
         Input:
         - universe is a sdd representing the state space (for example v.g.reachable)
         - universe is a sdd representing the state space (for example v.g.reachable)
-        - pred_dict is a list of tuples associating shoms and vectors of label strings
-        - pred is a shom representing the precedence relation (inverse of the transition relation)
+        - actions is a list of tuples associating shoms and vectors of label strings
         - tau_label is the label representing invisible actions, or '_None' if no invisible actions
         - tau_label is the label representing invisible actions, or '_None' if no invisible actions
         """
         """
-        assert isinstance(pred_dict, list), "pred_dict must be of type dict"
-        self.pred_dict = pred_dict
-        assert len(pred_dict) >= 1, "pred_dict must contain at least one element"
-        self.alpha_labels = set()
-        for action, labels in pred_dict: # for each key of the dictionnary
-            assert isinstance(action, shom), "every key of pred_dict must be of type shom"
+        assert isinstance(actions, list), "actions must be of type dict"
+        assert len(actions) >= 1, "actions must contain at least one element"
+        self.actions = actions
+        self.action_labels = set()
+        for action, labels in self.actions: # for each key of the dictionnary
+            assert isinstance(action, shom), "every key of actions must be of type shom"
             for l in labels:
             for l in labels:
-                assert isinstance(l, str), "every value of pred_dict must be of type str"
-                self.alpha_labels.add(l)
+                assert isinstance(l, str), "every value of actions must be of type str"
+                self.action_labels.add(l)
         self.alpha_labels = list(self.alpha_labels)   
         self.alpha_labels = list(self.alpha_labels)   
-        if tau_label in self.alpha_labels:
+        if tau_label in self.action_labels:
             self.tau_label = tau_label
             self.tau_label = tau_label
         else:
         else:
             self.tau_label = None
             self.tau_label = None
-        CTL_model_checker.__init__(self, universe, pred)
+        CTL_model_checker.__init__(self, universe, reduce(shom.__or__, [action for (action, labels) in self.actions]))
         self.logic = "ARCTL"
         self.logic = "ARCTL"
 
 
     def alpha_parse(self, alpha, labels):       
     def alpha_parse(self, alpha, labels):       
@@ -169,7 +168,7 @@ class ARCTL_model_checker(CTL_model_checker):
             else:
             else:
                 return False
                 return False
         elif alpha.kind == 'name':
         elif alpha.kind == 'name':
-            assert alpha.value in self.alpha_labels, f"{alpha.value} is not an action label"
+            assert alpha.value in self.action_labels, f"{alpha.value} is not an action label"
             if self.tau_label:
             if self.tau_label:
                 if self.tau_label in labels:
                 if self.tau_label in labels:
                     return True
                     return True
@@ -184,7 +183,7 @@ class ARCTL_model_checker(CTL_model_checker):
             raise ValueError(repr(alpha) + "is not an action sub formula")
             raise ValueError(repr(alpha) + "is not an action sub formula")
             
             
     def build_pred_alpha(self, alpha):
     def build_pred_alpha(self, alpha):
-        return reduce(shom.__or__, [action for (action, labels) in self.pred_dict if self.alpha_parse(alpha, labels)], shom.empty())
+        return reduce(shom.__or__, [action for (action, labels) in self.actions if self.alpha_parse(alpha, labels)], shom.empty())
 
 
     def check(self, formula):
     def check(self, formula):
         """
         """