Correct TP algorithm with fixed point (to be tested).

diff --git a/src/asta.ml b/src/asta.ml
index d866005..965486a 100644 (file)
--- a/src/asta.ml
+++ b/src/asta.ml
@@ -88,6 +88,14 @@ let transitions_lab asta lab =
     (remove_lab (SetT.elements (SetT.filter filter asta.trans_q)),
      (remove_lab (SetT.elements (SetT.filter filter asta.trans_r))))
 
+let transitions_st_lab asta q lab = 
+  let filter (s,l,f) = q = s && QNameSet.mem lab l in
+    let rec remove_st_lab = function
+      | [] -> []
+      | (s,l,f) :: tl -> f :: (remove_st_lab tl) in
+    (remove_st_lab (SetT.elements (SetT.filter filter asta.trans_q)),
+     (remove_st_lab (SetT.elements (SetT.filter filter asta.trans_r))))
+
 let empty = {
   quer = StateSet.empty;
   reco = StateSet.empty;

diff --git a/src/asta.mli b/src/asta.mli
index 7bbf13d..3fd9886 100644 (file)
--- a/src/asta.mli
+++ b/src/asta.mli
@@ -42,6 +42,10 @@ val transitions_lab : t -> QName.t -> (state*formula) list *(state*formula) list
 (** Give the list of states and formulae from queries and recognizing
     transitions for a given tag *)
 
+val transitions_st_lab : t -> state -> QName.t -> formula list * formula list
+(** Give the list of formulae from queries and recognizing transitions for a
+    given state and tag *)
+
 val empty : t
 (** The empty automaton *)
 

diff --git a/src/compil.ml b/src/compil.ml
index 22ae300..b15b069 100644 (file)
--- a/src/compil.ml
+++ b/src/compil.ml
@@ -47,7 +47,7 @@ let trans query =
 
   (* A selecting state is needed *)
   and trans_last (ax,test,pred) =
-    let fo_p = trans_pr pred in
+    let fo_p = trans_pr pred in         (* TODO (if ax=Self, only q *)
     let q,q' = Asta.new_state(), Asta.new_state() in
     Asta.add_selec asta q';
     Asta.add_quer asta q;

diff --git a/src/formula.mli b/src/formula.mli
index 7ec7320..bea2ff5 100644 (file)
--- a/src/formula.mli
+++ b/src/formula.mli
@@ -44,7 +44,7 @@ val expr : t -> t expr
 (** Equality over formulae *)
 
 val st : t -> StateSet.t * StateSet.t * StateSet.t
-(** states occuring self, left and right, positively or negatively *)
+(** States occuring self, left and right, positively or negatively *)
 
 val compare : t -> t -> int
 (** Comparison of formulae *)

diff --git a/src/run.ml b/src/run.ml
index 5d6580a..62ec37a 100644 (file)
--- a/src/run.ml
+++ b/src/run.ml
@@ -95,19 +95,14 @@ let rec bu_over_max asta run tree tnode =
       and _,resultr = try NodeHash.find run node
         with _ -> raise Over_max_fail in      
       let rec result set flag = function
-        | [] -> set,flag
+        | [] -> if flag = 0 then set else result set 0 list_tr
         | (q,form) :: tl ->
-          if Formula.infer_form (set,resultr) qf qn form (* infers the formula*)
-          then if StateSet.mem q set
-            then result set 0 tl
-            else result (StateSet.add q set) 1 tl
-          else result set 0 tl in
-      let rec fix_point set_i = 
-        let set,flag = result set_i 0 list_tr in
-        if flag = 0
-        then set
-        else fix_point set in
-      let result_set = fix_point StateSet.empty in
+          if StateSet.mem q set
+          then result set 0 tl
+          else if Formula.infer_form (set,resultr) qf qn form
+               then result (StateSet.add q set) 1 tl
+               else result set 0 tl in
+      let result_set = result StateSet.empty 0 list_tr in
       (* we keep the old recognizing states set *)
       NodeHash.replace run node (result_set, resultr)
     end
@@ -137,30 +132,52 @@ let rec tp_max asta run tree tnode =
       let qf,qn = q_rec fnode,q_rec nnode in
       let lab = Tree.tag tree tnode in
       let list_tr,_ = Asta.transitions_lab asta lab in (* only take query. *)
-      let (set_node,set_nr) as self = try NodeHash.find run node
+      let (self_q,self_r) = try NodeHash.find run node
         with Not_found -> raise Max_fail in
+
       (* We must compute again accepting states from self transitions since
          previous calls of tp_max may remove them *)
-      let rec comp_acc_self set flag =
-       () (* given a current set of states we add
-             states from self transitions which satisfy the two conditions *)
-      (* With result (below) we have all valid transitions at step 0
-      we compute the self states which occur in it and which are not in cthe current state.
-      For each of these states we compute the transitions with the correct label and state
-      we infer each of these transitions: true -> add self states occuring in it
-         to the acc and to the current set + add left and right states as result do *)
-      (* ----> With a FIFO *)
-      and fix_point selfq_i =
-        () in
-      NodeHash.replace run node (set_node, set_nr);
+      let rec result_q self_q queue = function (* for initializing the queue *)
+        | [] -> self_q,queue
+        | (q,form) :: tl ->
+          if (StateSet.mem q self_q)
+          then begin 
+            let q_cand,_,_ = Formula.st form in
+            StateSet.iter (fun x -> Queue.push x queue) q_cand;
+            result_q (StateSet.add q self_q) queue tl;
+          end
+          else result_q self_q queue tl
+      and result_st_q self_q queue flag = function (*for computing the fixed p*)
+        | [] -> flag,queue
+        | form :: tl ->
+          if Formula.infer_form (self_q,self_r) qf qn form
+          then begin 
+            let q_cand,_,_ = Formula.st form in
+            StateSet.iter (fun x -> Queue.push x queue) q_cand;
+            result_st_q self_q queue 1 tl;
+          end
+          else result_st_q self_q queue flag tl in
+      let rec comp_acc_self self_q_i queue = (* compute the fixed point *)
+        if Queue.is_empty queue
+        then self_q_i
+        else
+          let q = Queue.pop queue in
+          let list_q,_ = Asta.transitions_st_lab asta q lab in
+          let flag,queue = result_st_q self_q_i queue 0 list_q in
+          let self_q = if flag = 1 then StateSet.add q self_q_i else self_q_i in
+          comp_acc_self self_q queue in
       
+      let self,queue_init = result_q self_q (Queue.create()) list_tr in
+      let self_q = comp_acc_self self_q queue_init in
+      NodeHash.replace run node (self_q,self_r);
+      (* From now, the correct set of states is mapped to node! *)
       let rec result = function
         | [] -> []
         | (q,form) :: tl ->
-          if (StateSet.mem q set_node) &&  (* infers & trans. can start here *)
-            (Formula.infer_form self qf qn form)
+          if (StateSet.mem q self) &&  (* infers & trans. can start here *)
+            (Formula.infer_form (self_q,self_r) qf qn form)
           then form :: (result tl)
-          else result tl in
+          else result tl in      
       let list_form = result list_tr in (* tran. candidates *)
       (* compute states occuring in transition candidates *)
       let rec add_st (ql,qr) = function