X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=ocaml%2Flambda4.ml;h=3426b5acbde3d3d717a563d439b061d46accbe83;hb=7051416c234181eaf79dedfd18005cdf0a3e0863;hp=e5a09ec7c6eb06ba4d549f74cac46c26dd9d4bc0;hpb=8b69a4c59242b64294c7065a4e85437ce3cbc32d;p=fireball-separation.git diff --git a/ocaml/lambda4.ml b/ocaml/lambda4.ml index e5a09ec..3426b5a 100644 --- a/ocaml/lambda4.ml +++ b/ocaml/lambda4.ml @@ -3,6 +3,11 @@ open Util.Vars open Pure open Num +(* exceptions *) +exception Pacman +exception Bottom +exception Backtrack of string + (* The number of arguments which can applied to numbers safely, depending on the encoding of numbers. @@ -27,27 +32,33 @@ type problem = ; sigma: (int * nf) list (* the computed substitution *) ; deltas: discriminating_set ref list (* collection of all branches *) ; initialSpecialK: int + ; label : string + ; var_names : string list (* names of the original free variables *) ; trail: discriminating_set list list };; -(* exceptions *) -exception Pacman -exception Bottom -exception Backtrack of string +let label_of_problem {label} = label;; + +let string_of_var l x = + try + List.nth l x + with Failure "nth" -> "`" ^ string_of_int x +;; +let string_of_term p t = print ~l:p.var_names (t :> nf);; let first bound p var f = let p = {p with trail = (List.map (!) p.deltas)::p.trail} in let rec aux i = if i > bound then - raise (Backtrack ("no more alternatives for " ^ string_of_var var)) + raise (Backtrack ("no more alternatives for " ^ string_of_var p.var_names var)) else try f p i with Backtrack s -> prerr_endline (">>>>>> BACKTRACK (reason: " ^ s ^") measure=$ "); List.iter (fun (r,l) -> r := l) (List.combine p.deltas (List.hd p.trail)) ; -prerr_endline("Now trying var="^string_of_var var^" i="^string_of_int i); +prerr_endline("Now trying var="^string_of_var p.var_names var^" i="^string_of_int i); aux (i+1) in aux 1 @@ -74,22 +85,22 @@ let problem_measure p = sum_arities p;; let string_of_measure = string_of_int;; let string_of_problem label ({freshno; div; conv; ps; deltas} as p) = - Console.print_hline (); - prerr_string ("\n(* DISPLAY 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 - "measure="^string_of_measure(problem_measure p) (* ^ " freshno = " ^ string_of_int freshno*) - ^ nl ^ " Discriminating sets (deltas):" - ^ nl ^ " " ^ deltas ^ (if deltas = " " then "" else nl) ^ "*)" - ^"(* DIVERGENT *)" ^ nl - ^" "^ (match div with None -> "None" | Some div -> "(Some\""^ print ~l (div :> nf) ^"\")") ^ nl - ^" (* CONVERGENT *) [" ^ nl ^ " " - ^ String.concat "\n " (List.map (fun t -> "(* _ *) " ^ (if t = convergent_dummy then "" else "\""^ print ~l (t :> nf) ^"\";")) conv) ^ - (if conv = [] then "" else nl) - ^ "] (* NUMERIC *) [" ^ nl ^ " " - ^ String.concat "\n " (List.mapi (fun i t -> " (* "^ string_of_int i ^" *) \"" ^ print ~l (t :> nf) ^ "\";") ps) - ^ nl ^ "] [\"*\"];;" ^ nl + let deltas = String.concat ("\n# ") (List.map (fun r -> String.concat " <> " (List.map (fun (i,_) -> string_of_int i) !r)) deltas) in + let l = p.var_names in + String.concat "\n" ([ + ""; + "# DISPLAY PROBLEM (" ^ label ^ ") " ^ "measure=" ^ string_of_measure (problem_measure p); + if List.length p.deltas > 1 then ( + "# Discriminating sets (deltas):\n" ^ + "# " ^ deltas + ) else "# "; + "#"; + "$" ^ p.label; + (match div with None -> "# no D" | Some div -> "D " ^ print ~l (div :> nf)); + ] + @ List.map (fun t -> if t = convergent_dummy then "#C" else "C " ^ print ~l (t :> nf)) conv + @ List.mapi (fun i t -> string_of_int i ^ " " ^ print ~l (t :> nf)) ps + @ [""]) ;; @@ -257,12 +268,11 @@ List.iter (fun x -> prerr_endline ("IN2: " ^ print (fst x :> nf))) super_simplif let ps = List.map cast_to_i_n_var (old_ps @ new_ps) in let conv = List.map cast_to_i_n_var conv in -(let l = Array.to_list (Array.init (freshno + 1) string_of_var) in -prerr_endline ("# INST: " ^ string_of_var x ^ " := " ^ print ~l inst)); let p = {p with freshno; div; conv; ps} in + prerr_endline ("# INST: " ^ string_of_var p.var_names x ^ " := " ^ string_of_term p inst); ( (* check if double substituting a variable *) if List.exists (fun (x',_) -> x = x') sigma - then failwithProblem p ("Variable "^ string_of_var x ^"replaced twice") + then failwithProblem p ("Variable "^ string_of_var p.var_names x ^"replaced twice") ); let p = {p with sigma = sigma@[x,inst]} in let p = super_simplify p in @@ -304,7 +314,7 @@ and dangerous_inert arities showstoppers k args more_args = Not_found -> () (* cut & paste from above *) -let rec dangerous_conv arities showstoppers = +let rec dangerous_conv p arities showstoppers = function `N _ | `Var _ @@ -313,22 +323,22 @@ let rec dangerous_conv arities showstoppers = | `Match(t,_,liftno,bs,args) -> (* CSC: XXX partial dependency on the encoding *) (match t with - `N _ -> concat_map (dangerous_conv arities showstoppers) args - | `Match _ as t -> dangerous_conv arities showstoppers t @ concat_map (dangerous_conv arities showstoppers) args - | `Var(x,_) -> dangerous_inert_conv arities showstoppers x [] args 2 - | `I((x,_),args') -> dangerous_inert_conv arities showstoppers x (Listx.to_list args') args 2 + `N _ -> concat_map (dangerous_conv p arities showstoppers) args + | `Match _ as t -> dangerous_conv p arities showstoppers t @ concat_map (dangerous_conv p arities showstoppers) args + | `Var(x,_) -> dangerous_inert_conv p arities showstoppers x [] args 2 + | `I((x,_),args') -> dangerous_inert_conv p arities showstoppers x (Listx.to_list args') args 2 ) - | `I((k,_),args) -> dangerous_inert_conv arities showstoppers k (Listx.to_list args) [] 0 + | `I((k,_),args) -> dangerous_inert_conv p arities showstoppers k (Listx.to_list args) [] 0 -and dangerous_inert_conv arities showstoppers k args match_args more_args = +and dangerous_inert_conv p arities showstoppers k args match_args more_args = let all_args = args @ match_args in - let dangerous_args = concat_map (dangerous_conv arities showstoppers) all_args in + let dangerous_args = concat_map (dangerous_conv p arities showstoppers) all_args in let all_args = (all_args :> nf list) in if dangerous_args = [] then ( if List.mem k showstoppers then k :: concat_map free_vars all_args else try let arity = arity_of arities k in -prerr_endline ("dangerous_inert_conv: ar=" ^ string_of_int arity ^ " k="^string_of_var k ^ " listlenargs=" ^ (string_of_int (List.length args)) ^ " more_args=" ^ string_of_int more_args); +prerr_endline ("dangerous_inert_conv: ar=" ^ string_of_int arity ^ " k="^string_of_var p.var_names k ^ " listlenargs=" ^ (string_of_int (List.length args)) ^ " more_args=" ^ string_of_int more_args); if more_args > 0 (* match argument*) && List.length args = arity then [] else if List.length all_args + more_args > arity then k :: concat_map free_vars all_args else [] with @@ -336,7 +346,7 @@ prerr_endline ("dangerous_inert_conv: ar=" ^ string_of_int arity ^ " k="^string_ ) else k :: concat_map free_vars all_args (* inefficient algorithm *) -let rec edible arities div ps conv showstoppers = +let rec edible ({div; conv; ps} as p) arities showstoppers = let rec aux showstoppers = function [] -> showstoppers @@ -361,10 +371,10 @@ let rec edible arities div ps conv showstoppers = in let showstoppers = sort_uniq (aux showstoppers ps) in let dangerous_conv = - List.map (dangerous_conv arities showstoppers) conv in + List.map (dangerous_conv p arities showstoppers) (conv :> nf_nob list) in prerr_endline ("dangerous_conv lenght:" ^ string_of_int (List.length dangerous_conv)); -List.iter (fun l -> prerr_endline (String.concat " " (List.map string_of_var l))) dangerous_conv; +List.iter (fun l -> prerr_endline (String.concat " " (List.map (string_of_var p.var_names) l))) dangerous_conv; let showstoppers' = showstoppers @ List.concat dangerous_conv in let showstoppers' = sort_uniq (match div with @@ -372,7 +382,7 @@ List.iter (fun l -> prerr_endline (String.concat " " (List.map string_of_var l)) | Some div -> if List.exists ((=) (hd_of_i_var div)) showstoppers' then showstoppers' @ free_vars (div :> nf) else showstoppers') in - if showstoppers <> showstoppers' then edible arities div ps conv showstoppers' else showstoppers', dangerous_conv + if showstoppers <> showstoppers' then edible p arities showstoppers' else showstoppers', dangerous_conv ;; let precompute_edible_data {ps; div} xs = @@ -412,8 +422,8 @@ let critical_showstoppers p = let showstoppers_eat = List.filter (fun x -> not (List.mem x showstoppers_step)) showstoppers_eat in - List.iter (fun v -> prerr_endline ("DANGEROUS STEP: " ^ string_of_var v)) showstoppers_step; - List.iter (fun v -> prerr_endline ("DANGEROUS EAT: " ^ string_of_var v)) showstoppers_eat; + List.iter (fun v -> prerr_endline ("DANGEROUS STEP: " ^ (string_of_var p.var_names) v)) showstoppers_step; + List.iter (fun v -> prerr_endline ("DANGEROUS EAT: " ^ (string_of_var p.var_names) v)) showstoppers_eat; p, showstoppers_step, showstoppers_eat ;; @@ -423,15 +433,14 @@ let eat p = let heads = List.sort compare (filter_map hd_of ps) in let arities = precompute_edible_data p (uniq heads) in let showstoppers, showstoppers_conv = - edible arities p.div ps (p.conv :> nf_nob list) showstoppers in + edible p arities showstoppers in let l = List.filter (fun (x,_,_) -> not (List.mem x showstoppers)) arities in let p = List.fold_left (fun p (x,pos,(xx : i_n_var)) -> if pos = -1 then p else let n = match xx with `I(_,args) -> Listx.length args | _ -> 0 in let v = `N(pos) in let inst = make_lams v n in -(let l = Array.to_list (Array.init (p.freshno + 1) string_of_var) in -prerr_endline ("# INST_IN_EAT: " ^ string_of_var x ^ " := " ^ print ~l inst)); +prerr_endline ("# INST_IN_EAT: " ^ string_of_var p.var_names x ^ " := " ^ string_of_term p inst); { p with sigma = p.sigma @ [x,inst] } ) p l in (* to avoid applied numbers in safe positions that @@ -455,7 +464,7 @@ prerr_endline ("# INST_IN_EAT: " ^ string_of_var x ^ " := " ^ print ~l inst)); subst_in_problem x inst p in let dangerous_conv = showstoppers_conv in let _ = prerr_endline ("dangerous_conv lenght:" ^ string_of_int (List.length dangerous_conv)); -List.iter (fun l -> prerr_endline (String.concat " " (List.map string_of_var l))) dangerous_conv; in +List.iter (fun l -> prerr_endline (String.concat " " (List.map (string_of_var p.var_names) l))) dangerous_conv; in let conv = List.map (function s,t -> try @@ -466,7 +475,7 @@ List.iter (fun l -> prerr_endline (String.concat " " (List.map string_of_var l)) with Not_found -> match hd_of t with | None -> assert (t = convergent_dummy); t | Some h -> - prerr_endline ("FREEZING " ^ string_of_var h); + prerr_endline ("FREEZING " ^ string_of_var p.var_names h); convergent_dummy ) (List.combine showstoppers_conv p.conv) in List.iter @@ -537,7 +546,7 @@ let choose_step (n,p) = let x = match showstoppers_step, showstoppers_eat with | [], y::_ -> - prerr_endline ("INSTANTIATING CRITICAL TO EAT " ^ string_of_var y); y + prerr_endline ("INSTANTIATING CRITICAL TO EAT " ^ string_of_var p.var_names y); y | [], [] -> let heads = (* Choose only variables still alive (with arity > 0) *) @@ -551,10 +560,10 @@ let choose_step (n,p) = with Not_found -> assert false) | x::_ -> - prerr_endline ("INSTANTIATING TO EAT " ^ string_of_var x); + prerr_endline ("INSTANTIATING TO EAT " ^ string_of_var p.var_names x); x) | x::_, _ -> - prerr_endline ("INSTANTIATING " ^ string_of_var x); + prerr_endline ("INSTANTIATING " ^ string_of_var p.var_names x); x in (* Strategy that decreases the special_k to 0 first (round robin) 1:11m42 2:14m5 3:11m16s 4:14m46s 5:12m7s 6:6m31s *) @@ -567,7 +576,7 @@ let choose_step (n,p) = with | None -> assert false | Some x -> - prerr_endline ("INSTANTIATING AND HOPING " ^ string_of_var x); + prerr_endline ("INSTANTIATING AND HOPING " ^ string_of_var p.var_names x); x with Not_found -> @@ -720,13 +729,11 @@ let run p = let p_finale = auto p p.initialSpecialK in let freshno,sigma = p_finale.freshno, p_finale.sigma in prerr_endline ("------- ------ measure=. \n "); - let l = Array.to_list (Array.init (freshno + 1) string_of_var) in - List.iter (fun (x,inst) -> prerr_endline (string_of_var x ^ " := " ^ print ~l inst)) sigma; + List.iter (fun (x,inst) -> prerr_endline (string_of_var p_finale.var_names x ^ " := " ^ string_of_term p_finale inst)) sigma; prerr_endline "-------------------"; let sigma = optimize_numerals p_finale in (* optimize numerals *) - let l = Array.to_list (Array.init (freshno + 1) string_of_var) in - List.iter (fun (x,inst) -> prerr_endline (string_of_var x ^ " := " ^ print ~l inst)) sigma; + List.iter (fun (x,inst) -> prerr_endline (string_of_var p_finale.var_names x ^ " := " ^ string_of_term p_finale inst)) sigma; prerr_endline "------------------"; let scott_of_nf t = ToScott.scott_of_nf (t :> nf) in @@ -777,7 +784,8 @@ let solve (p, todo) = ;; let check p = - (* check if there are duplicates in p.ps *) + (* TODO check if there are duplicates in p.ps + before it was: ps = sort_uniq ~compare:eta_compare (ps :> nf list) *) (* FIXME what about initial fragments? *) if (let rec f = function | [] -> false @@ -797,62 +805,17 @@ let check p = else `Uncomplete ;; -let zero = `Var(0,0);; - -let append_zero = - function - | `I _ - | `Var _ as i -> cast_to_i_n_var (mk_app i zero) - | `N _ -> raise (Parser.ParsingError " numbers in ps") -;; - -let problem_of_2 (label, div, conv, nums, var_names) = - (* DA SPOSTARE NEI TEST: *) - let ps = List.map append_zero nums in (* crea lista applicando zeri o dummies *) - let ps = sort_uniq ~compare:eta_compare (ps :> nf list) in - let ps = List.map (cast_to_i_n_var) ps in - - (* TODO: *) - (* replace div with bottom in problem??? *) - let special_k = - let all_tms = (match div with None -> [] | Some div -> [(div :> i_n_var)]) @ nums @ conv in - compute_special_k (Listx.from_list (all_tms :> nf list)) in (* compute initial special K *) +let problem_of (label, div, conv, ps, var_names) = + (* TODO: replace div with bottom in problem??? *) + let all_tms = (match div with None -> [] | Some div -> [(div :> i_n_var)]) @ ps @ conv in + if all_tms = [] then failwith "problem_of: empty problem"; + let initialSpecialK = compute_special_k (Listx.from_list (all_tms :> nf list)) in let freshno = List.length var_names in let deltas = let dummy = `Var (max_int / 2, -666) in [ ref (Array.to_list (Array.init (List.length ps) (fun i -> i, dummy))) ] in let trail = [] in - let p = {freshno; div; conv; ps; sigma=[] ; deltas; initialSpecialK=special_k; trail} in + let sigma = [] in + let p = {freshno; div; conv; ps; sigma; deltas; initialSpecialK; trail; var_names; label} in p, check p ;; - -let problem_of ~div ~conv ~nums = - let all_tms = (match div with None -> [] | Some div -> [div]) @ nums @ conv in - let all_tms, var_names = Parser.parse' all_tms in - let div, (ps, 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 - - let div = - match div with - | None | Some `Bottom -> None - | Some (`I _ as t) -> Some t - | _ -> raise (Parser.ParsingError "div is not an inert or BOT in the initial problem") in - let conv = Util.filter_map ( - function - | #i_n_var as t -> Some t - | `Lam _ -> None - | _ -> raise (Parser.ParsingError "A term in conv is not i_n_var") - ) conv in - let ps = List.map ( - function - | #i_n_var as y -> y - | _ -> raise (Parser.ParsingError "A term in num is not i_n_var") - ) ps in - problem_of_2("missing label", div, conv, ps, var_names) -;; - -let problem_of_string_tmp s = - let x = Parser.problem_of_string s in - problem_of_2 x -;;