X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=src%2Frun.ml;h=fff387a692ebbe36b8ea614f1cd7d9efce35a65f;hb=5cfe8f8725b83eadae6923a10929b5db9204049c;hp=9ece6ee9cb8c3da99d1e12e3f97bd8c5e7fa50fe;hpb=d0dc6fbd661c7a79a2d8f875a204f587e6a5162d;p=tatoo.git diff --git a/src/run.ml b/src/run.ml index 9ece6ee..fff387a 100644 --- a/src/run.ml +++ b/src/run.ml @@ -25,7 +25,7 @@ module NodeHash = Hashtbl.Make (Node) type t = (StateSet.t*StateSet.t) NodeHash.t (** Map from nodes to query and recognizing states *) -(* Note that we do not consider the nil nodes *) +(* Note that we do not consider nil nodes *) exception Oracle_fail exception Over_max_fail @@ -33,7 +33,6 @@ exception Max_fail (* Mapped sets for leaves *) let map_leaf asta = (Asta.bot_states_s asta, StateSet.empty) -let empty = (StateSet.empty,StateSet.empty) (* Build the Oracle *) let rec bu_oracle asta run tree tnode = @@ -44,36 +43,42 @@ let rec bu_oracle asta run tree tnode = then () else NodeHash.add run node (map_leaf asta) else - let tfnode = Tree.first_child tree tnode (* first child *) - and tnnode = Tree.next_sibling tree tnode in (* next-sibling *) - let fnode,nnode = + let tfnode = Tree.first_child_x tree tnode + and tnnode = Tree.next_sibling tree tnode in + let fnode,nnode = (* their preorders *) (Tree.preorder tree tfnode, Tree.preorder tree tnnode) in begin bu_oracle asta run tree tfnode; bu_oracle asta run tree tnnode; - let q_rec n = + let q_rec n = (* compute the set for child/sibling *) try NodeHash.find run n with Not_found -> map_leaf asta in let (_,qfr),(_,qnr) = q_rec fnode,q_rec nnode (* computed in rec call *) and lab = Tree.tag tree tnode in - let _,list_tr = Asta.transitions_lab asta lab in (* only take reco. *) - let rec result set = function - | [] -> set + let _,list_tr = Asta.transitions_lab asta lab in (* only reco. tran.*) + let rec result set flag = function (* add states which satisfy a transition *) + | [] -> set,flag | (q,form) :: tl -> - if Formula.eval_form (qfr,qnr) form - then result (StateSet.add q set) tl - else result set tl in - let result_set = result StateSet.empty list_tr in - NodeHash.add run node (StateSet.empty, result_set) + if Formula.eval_form (set,qfr,qnr) form (* evaluates 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 = (* compute the fixed point of states of node *) + let set,flag = result set_i 0 list_tr in + if flag = 0 then set + else fix_point set in + NodeHash.add run node (StateSet.empty, fix_point StateSet.empty) end - + (* Build the over-approx. of the maximal run *) let rec bu_over_max asta run tree tnode = if (Tree.is_leaf tree tnode) (* BU_oracle has already created the map *) then () else - let tfnode = Tree.first_child tree tnode + let tfnode = Tree.first_child_x tree tnode and tnnode = Tree.next_sibling tree tnode in begin bu_over_max asta run tree tfnode; @@ -84,20 +89,27 @@ let rec bu_over_max asta run tree tnode = let q_rec n = try NodeHash.find run n with Not_found -> map_leaf asta in - let (qfq,qfr),(qnq,qnr) = q_rec fnode,q_rec nnode in + 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 st. *) - let rec result set = function - | [] -> set - | (q,form) :: tl -> - if Formula.infer_form (qfq,qnq) (qfr,qnr) form - then result (StateSet.add q set) tl - else result set tl in - let _,resultr = try NodeHash.find run node + let list_tr,_ = Asta.transitions_lab asta lab (* only take query st. *) + and _,resultr = try NodeHash.find run node with _ -> raise Over_max_fail in - let result_set = result StateSet.empty list_tr in + let rec result set flag = function + | [] -> set,flag + | (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 + (* we keep the old recognizing states set *) NodeHash.replace run node (result_set, resultr) - (* Never remove elt in Hash (the old one would appear) *) end @@ -108,12 +120,12 @@ let rec tp_max asta run tree tnode = () else let node = Tree.preorder tree tnode - and tfnode = Tree.first_child tree tnode + and tfnode = Tree.first_child_x tree tnode and tnnode = Tree.next_sibling tree tnode in let (fnode,nnode) = (Tree.preorder tree tfnode, Tree.preorder tree tnnode) in begin - if tnode == Tree.root tree (* we must intersectt with top states *) + if tnode == Tree.root tree (* we must intersect with top states *) then let setq,_ = try NodeHash.find run node with _ -> raise Max_fail in NodeHash.replace run node @@ -122,19 +134,35 @@ let rec tp_max asta run tree tnode = let q_rec n = try NodeHash.find run n with Not_found -> map_leaf asta in - let (qfq,qfr),(qnq,qnr) = q_rec fnode,q_rec nnode in + 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,_ = try NodeHash.find run node - with _ -> raise Max_fail in + let (set_node,set_nr) as self = 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 = function | [] -> [] | (q,form) :: tl -> - if (Formula.infer_form (qfq,qnq) (qfr,qnr) form) && - (StateSet.mem q set_node) + if (StateSet.mem q set_node) && (* infers & trans. can start here *) + (Formula.infer_form self qf qn form) then form :: (result tl) else result tl in - let list_form = result list_tr in + let list_form = result list_tr in (* tran. candidates *) + (* compute states occuring in transition candidates *) let rec add_st (ql,qr) = function | [] -> ql,qr | f :: tl -> let sql,sqr = Formula.st f in @@ -147,12 +175,13 @@ let rec tp_max asta run tree tnode = and qnq,qnr = try NodeHash.find run nnode with | _ -> map_leaf asta in begin - if tfnode == Tree.nil + if tfnode == Tree.nil || Tree.is_attribute tree tnode then () else NodeHash.replace run fnode (StateSet.inter qfq ql,qfr); - if tnnode == Tree.nil + if tnnode == Tree.nil || Tree.is_attribute tree tnode then () else NodeHash.replace run nnode (StateSet.inter qnq qr,qnr); + (* indeed we delete all states from self transitions! *) tp_max asta run tree tfnode; tp_max asta run tree tnnode; end; @@ -160,7 +189,7 @@ let rec tp_max asta run tree tnode = let compute tree asta = let flag = 2 in (* debug *) - let size_tree = 10000 in (* todo *) + let size_tree = 10000 in (* todo (Tree.size ?) *) let map = NodeHash.create size_tree in bu_oracle asta map tree (Tree.root tree); if flag > 0 then begin @@ -178,7 +207,7 @@ let selected_nodes tree asta = NodeHash.fold (fun key set acc -> if not(StateSet.is_empty - (StateSet.inter (fst set) (Asta.selec_states asta))) + (StateSet.inter (fst set) (Asta.selec_states asta))) then key :: acc else acc) run []