then ()
else NodeHash.add run node (map_leaf asta)
else
- let tfnode = Tree.first_child tree tnode
+ 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
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;
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
()
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
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 = function
- | [] -> set,flag
+ let rec result_q self_q queue = function (* for initializing the queue *)
+ | [] -> self_q,queue
| (q,form) :: tl ->
- if Formula.infer_form set qf qn form
- then if StateSet.mem q set
- then comp_acc_self set 0 tl
- else comp_acc_self (StateSet.add q set) 1 tl
- else comp_acc_self set 0 tl
- and rec fix_point selfq_i =
- let setq,flag = comp_acc_self selfq_i 0 list_tr in
- if flag = 1 then set
- else fix_point setq qf qn 0 in
- NodeHash.replace run node (fix_point set_node, set_nr);
+ 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
| [] -> ql,qr
- | f :: tl -> let sql,sqr = Formula.st f in
+ | f :: tl -> let sqs,sql,sqr = Formula.st f in
let ql' = StateSet.union sql ql
and qr' = StateSet.union sqr qr in
add_st (ql',qr') tl in
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! *)
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 []
projects / tatoo.git / blobdiff