From cabe9fc1b8ec6c5350ef64b4e9adef8255949423 Mon Sep 17 00:00:00 2001 From: Artur Meski Date: Tue, 4 Apr 2017 22:48:11 +0200 Subject: [PATCH] operators --- logics/rsltl.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/logics/rsltl.py b/logics/rsltl.py index 48c8b0c..e8bd959 100644 --- a/logics/rsltl.py +++ b/logics/rsltl.py @@ -49,6 +49,18 @@ class Formula_rsLTL(object): def f_bag(cls, bag_descr): return cls(rsLTL_form_type.bag, bag = bag_descr) + @classmethod + def f_And(cls, arg_L, arg_R): + return cls(rsLTL_form_type.l_and, L_oper = arg_L, R_oper = arg_R) + + @classmethod + def f_Or(cls, arg_L, arg_R): + return cls(rsLTL_form_type.l_or, L_oper = arg_L, R_oper = arg_R) + + @classmethod + def f_Implies(cls, arg_L, arg_R): + return cls(rsLTL_form_type.l_implies, L_oper = arg_L, R_oper = arg_R) + @classmethod def f_X(cls, sub, arg): return cls(rsLTL_form_type.t_next, L_oper = arg, sub_oper = sub) @@ -69,10 +81,6 @@ class Formula_rsLTL(object): def f_R(cls, sub, arg_L, arg_R): return cls(rsLTL_form_type.t_release, L_oper = arg_L, R_oper = arg_R, sub_oper = sub) - @classmethod - def f_Implies(cls, arg_L, arg_R): - return cls(rsLTL_form_type.l_implies, L_oper = arg_L, R_oper = arg_R) - def __and__(self, other): return Formula_rsLTL(rsLTL_form_type.l_and, L_oper = self, R_oper = other)