; ps: i_n_var list (* the n-th inert must become n *)
; sigma: (int * nf) list (* the computed substitution *)
; deltas: (int * nf) list ref list (* collection of all branches *)
- ; steps: int (* how many steps the algorithm made until now *)
}
| `I(v,ts) ->
(* applicative (`Var v) (Listx.to_list ts) @ *)
Util.concat_map aux (Listx.to_list ts) @ List.map apply_var (Listx.to_list ts)
- | `Lam(_,t) -> aux (lift ~-1 t)
- | `Match(u,bs_lift,bs,args) ->
+ | `Lam(_,_,t) -> aux (lift ~-1 t)
+ | `Match(u,_,bs_lift,bs,args) ->
aux (u :> nf) @
(* applicative (`Match(u,bs_lift,bs,[])) args @ *)
Util.concat_map aux args @ List.map apply_var args
@ p.ps
;;
-let problem_measure p =
- let l = Array.to_list (Array.init (p.freshno + 1) string_of_var) in
- let open Listx in
- (* aux |t1;t2| e' numero di step per portare la diff in testa
- INVARIANTE: t1 <eta> t2
- *)
- let rec aux t1 t2 =
- match t1, t2 with
- | `I(v1,nfs1), `I(v2,nfs2) ->
- if v1 <> v2
- then 0 else 1 + find_first_diff (to_list nfs1, to_list nfs2)
- | `Match (t1,bs_lift,bs,args), `Match (t2,bs_lift',bs',args') ->
- if bs != bs' then 0 (* TODO *)
- else if eta_eq (t1 :> nf) (t2 :> nf) then 1 + find_first_diff (args, args') else aux (t1 :> nf) (t2 :> nf) (* TODO *)
- | `Match _, _
- | _, `Match _ -> 0 (* FIXME!!! *)
- | `Lam(_,t1), `Lam(_,t2) -> aux t1 t2
- | _ -> 0
- and find_first_diff = function
- | [], [] -> assert false
- | [], t::_
- | t::_, [] -> 1
- | t1::ts1, t2::ts2 ->
- if eta_eq (t1 :> nf) (t2 :> nf) then 1 + find_first_diff (ts1, ts2) else aux t1 t2
- (* no. di step da fare per separare t1 e t2 *)
- in let diff t1 t2 = (
- let res = if eta_eq t1 t2 then 0 else aux t1 t2 in
- if res <> 0 then prerr_endline ("diff (" ^ print ~l t1 ^ ") (" ^ print ~l t2 ^ ") = " ^ string_of_int res);
- res
- )
- (* aux calcola la somma delle differenze tra i termini in una lista (quadratico) *)
- in let rec sum = function
- | [] -> 0
- | x::xs -> List.fold_right ((+) ++ (diff (x :> nf))) (xs :> nf list) (sum xs)
- in let subterms = subterms ((all_terms p) :> nf list) p.freshno
- (* let subterms = sort_uniq ~compare:eta_compare subterms in *)
- in let a = sum subterms
- in let b = List.fold_right (fun bs -> (+) (sum (List.map ((List.nth p.ps) ++ fst) !bs))) p.deltas 0
- in let _ = prerr_endline ("Computed measure: " ^ string_of_int a ^ "," ^ string_of_int b)
- in a + b
-;;
+let problem_measure p = 0 ;;
-let print_problem label ({freshno; div; conv; ps; deltas; steps} as p) =
+let print_problem label ({freshno; div; conv; ps; deltas} as p) =
Console.print_hline ();
prerr_endline ("\n||||| Displaying problem: " ^ label ^ " |||||");
let nl = "\n| " in
let deltas = String.concat nl (List.map (fun r -> String.concat " <> " (List.map (fun (i,_) -> string_of_int i) !r)) deltas) in
let l = Array.to_list (Array.init (freshno + 1) string_of_var) in
- nl ^ string_of_int steps ^ " steps left; measure="^string_of_int(problem_measure p)^" freshno = " ^ string_of_int freshno
+ nl ^ "measure="^string_of_int(problem_measure p)^" freshno = " ^ string_of_int freshno
^ nl ^ "\b> DISCRIMINATING SETS (deltas)"
^ nl ^ deltas ^ (if deltas = "" then "" else nl)
^ "\b> DIVERGENT" ^ nl
let simple_expand_match ps =
let rec aux level = function
| #i_num_var as t -> aux_i_num_var level t
- | `Lam(b,t) -> `Lam(b, aux (level+1) t)
+ | `Lam(b,ar,t) -> `Lam(b,ar,aux (level+1) t)
and aux_i_num_var level = function
- | `Match(u,bs_lift,bs,args) as torig ->
+ | `Match(u,ar,bs_lift,bs,args) as torig ->
let u = aux_i_num_var level u in
bs := List.map (fun (n, x) -> n, aux 0 x) !bs;
(try
(match u with
| #i_n_var as u ->
let i = index_of (lift (-level) u) (ps :> nf list) (* can raise Not_found *)
- in let t = mk_match (`N i) bs_lift bs args in
+ in let t = mk_match (`N i) ar bs_lift bs args in
if t <> torig then
aux level (t :> nf)
else raise Not_found
| _ -> raise Not_found)
with Not_found ->
- `Match(cast_to_i_num_var u,bs_lift,bs,List.map (aux level) args))
+ `Match(cast_to_i_num_var u,ar,bs_lift,bs,List.map (aux level) args))
| `I(k,args) -> `I(k,Listx.map (aux level) args)
| `N _ | `Var _ as t -> t
in aux_i_num_var 0;;
and expand_match ((freshno,acc_ps,acc_new_ps) as acc) t =
match t with
- | `Match(u',bs_lift,bs,args) ->
+ | `Match(u',ar,bs_lift,bs,args) ->
let freshno,u,acc_new_ps = expand_match acc (u' :> nf) in
let acc_new_ps,i =
match u with
bs := !bs @ [i, v] ;
freshno in
(*prerr_endlie ("t DA RIDURRE:" ^ print (`Match(`N i,arity,bs_lift,bs,args) :> nf) ^ " more_args=" ^ string_of_int more_args);*)
- let t = mk_match (`N i) bs_lift bs args in
+ let t = mk_match (`N i) ar bs_lift bs args in
(*prerr_endline ("NUOVO t:" ^ print (fst t :> nf) ^ " more_args=" ^ string_of_int (snd t));*)
expand_match (freshno,acc_ps,acc_new_ps) t
| `Lam _ -> raise ExpandedToLambda
`N _
| `Var _
| `Lam _ -> ()
- | `Match(t,liftno,bs,args) ->
+ | `Match(t,_,liftno,bs,args) ->
(* CSC: XXX partial dependency on the encoding *)
(match t with
`N _ -> List.iter (dangerous arities showstoppers) args
`N _
| `Var _
| `Lam _ -> []
- | `Match(t,liftno,bs,args) ->
+ | `Match(t,_,liftno,bs,args) ->
(* CSC: XXX partial dependency on the encoding *)
(match t with
`N _ -> concat_map (dangerous_conv arities showstoppers) args
let zero = Listx.Nil zero in
let args = if n = 0 then zero else Listx.append zero (Listx.from_list vars) in
let bs = ref [] in
- let inst = `Lam(false,`Match(`I(0,Listx.map (lift 1) args),1,bs,[])) in
+ let arity1 = (assert false; -666) in
+ let arity2 = (assert false; -666) in
+ let inst = `Lam(false,arity1,`Match(`I(0,Listx.map (lift 1) args),arity2,1,bs,[])) in
let p = {p with deltas=bs::p.deltas} in
subst_in_problem x inst p
;;
let compute_special_k tms =
let rec aux k (t: nf) = Pervasives.max k (match t with
- | `Lam(b,t) -> aux (k + if b then 1 else 0) t
+ | `Lam(b,_,t) -> aux (k + if b then 1 else 0) t
| `I(n, tms) -> Listx.max (Listx.map (aux 0) tms)
- | `Match(t, liftno, bs, args) ->
+ | `Match(t,_,liftno, bs, args) ->
List.fold_left max 0 (List.map (aux 0) ((t :> nf)::args@List.map snd !bs))
| `N _ -> 0
| `Var _ -> 0
prerr_endline
("Measure did not decrease (delta=" ^ string_of_int delta ^ ")"))
else prerr_endline ("$ Measure decreased by " ^ string_of_int delta);
- let p' = {p' with steps=(p'.steps - 1)} in
- (if p'.steps < 0 then prerr_endline ">>>>>>>>>> STEPS ARE OVER <<<<<<<<<"
- (*failwithProblem p' "steps are over. sorry."*) );
auto_eat (n,p)
;;
| `N n -> `N (List.nth perm n)
| `I _ -> assert false
| `Var _ as t -> t
- | `Lam(v,t) -> `Lam(v, aux t)
- | `Match(_,_,bs,_) as t -> (bs := List.map (fun (n,t) -> (List.nth perm n, t)) !bs); t
+ | `Lam(v,ar,t) -> `Lam(v, ar, aux t)
+ | `Match(_,_,_,bs,_) as t -> (bs := List.map (fun (n,t) -> (List.nth perm n, t)) !bs); t
in List.map (fun (n,t) -> (n,aux t))
in
let deltas' = List.mapi (fun n d -> (n, List.map fst !d)) p.deltas in
bomb := `Var (-1);
let p_finale = aux p n cmds in
let freshno,sigma = p_finale.freshno, p_finale.sigma in
- prerr_endline ("------- <DONE> ------\n " ^ (string_of_int (p.steps - p_finale.steps)) ^ " steps of "^ (string_of_int p.steps) ^".");
+ prerr_endline ("------- <DONE> ------\n ");
(* prerr_endline (print_problem "Original problem" p); *)
prerr_endline "---------------------";
let l = Array.to_list (Array.init (freshno + 1) string_of_var) in
| _ -> assert false
;;
-let bounds_on_steps all_tms =
- let rec aux = function
- | `I(k,args) -> Listx.fold_left (fun acc t -> 1 + acc + (aux t)) 0 args
- | `Var _ -> 1
- | `Lam (_, t) -> 1 + aux t
- | _ -> assert false
- in List.fold_right ((+) ++ aux) all_tms 0
-;;
-
type t = problem * int * string list;;
let magic_conv ~div ~conv ~nums cmds =
let all_tms = (match div with None -> [] | Some div -> [div]) @ nums @ conv in
let all_tms, var_names = parse' all_tms in
- let steps = bounds_on_steps all_tms in
let div, (tms, conv) = match div with
| None -> None, list_cut (List.length nums, all_tms)
| Some _ -> Some (List.hd all_tms), list_cut (List.length nums, List.tl all_tms) in
if match div with None -> false | Some div -> List.exists (eta_subterm div) (tms@conv)
then (
prerr_endline "--- TEST SKIPPED ---";
- {freshno=0; div=None; conv=[]; ps=[]; sigma=[]; deltas=[]; steps=(-1)}, 0, []
+ {freshno=0; div=None; conv=[]; ps=[]; sigma=[]; deltas=[]}, 0, []
) else
let tms = sort_uniq ~compare:eta_compare tms in
let special_k = compute_special_k (Listx.from_list all_tms) in (* compute initial special K *)
let dummy = `Var (max_int / 2) in
[ ref (Array.to_list (Array.init (List.length ps) (fun i -> i, dummy))) ] in
- {freshno; div; conv; ps; sigma=[] ; deltas; steps}, special_k, cmds
+ {freshno; div; conv; ps; sigma=[] ; deltas}, special_k, cmds
;;
let magic strings cmds = magic_conv None [] strings cmds;;
projects / fireball-separation.git / blobdiff