let res = f x in
let after = Unix.gettimeofday () in
let delta = after -. before in
- if res = Unix.WEXITED 0 then
+ if res then
ok_time := !ok_time +. delta
else
ko_time := !ko_time +. delta;
(*ignore (read_line ())*)
;;
+(******** communication with matitawiki ************)
+let min_ch,mout_ch = Unix.open_process "../../../matitawiki.opt 2> /dev/null";;
+
+let exec_cmd ?(undo=false) s =
+ let un = if undo then "un" else "" in
+(*prerr_endline ("<pgip><" ^ un ^ "doitem>" ^ s ^ "</" ^ un ^ "doitem></pgip>\n");*)
+ output_string mout_ch ("<pgip><" ^ un ^ "doitem>" ^ s ^ "</" ^ un ^ "doitem></pgip>\n");
+ flush mout_ch;
+ let rec aux v =
+ let l = input_line min_ch in
+ let last = String.length l - 1 in
+ assert (last > 0);
+ if l.[last] = Char.chr 249 then
+ int_of_string (String.sub l 0 last)
+ else
+ aux l
+ in
+ aux "x"
+;;
+
+let exec_cmds =
+ let rec aux undopos =
+ function
+ [] -> true
+ | he::tl ->
+ let pos = exec_cmd he in
+ if pos = -1 then
+ begin
+ match undopos with
+ None -> assert false
+ | Some undopos ->
+ assert (exec_cmd ~undo:true (string_of_int (undopos - 1)) <> -1);
+ false
+ end
+ else
+ match undopos with
+ None -> aux (Some pos) tl
+ | _ -> aux undopos tl
+ in
+ aux None
+
+let _ =
+ assert (exec_cmd "set \"baseuri\" \"cic:/matita/theory_former\"." <> -1);
+ assert (exec_cmd "include \"formal_topology.ma\"." <> -1);
+;;
+
+(********* testing a conjecture *******************)
+
let test to_be_considered_and_now ((s,_,_) as set) rel candidate repr =
ps_of_set to_be_considered_and_now ~processing:(candidate,rel,repr) set;
print_string
(string_of_cop candidate ^ " " ^ string_of_rel rel ^ " " ^ string_of_cop repr ^ "? ");
flush stdout;
+(*
assert (Unix.system "cat log.ma | sed s/^theorem/axiom/g | sed 's/\\. intros.*qed\\././g' > xxx.ma" = Unix.WEXITED 0);
let ch = open_out_gen [Open_append] 0 "xxx.ma" in
+*)
(*
let i = ref 0 in
List.iter
SupersetEqual -> repr,SubsetEqual,candidate
| Equal
| SubsetEqual -> candidate,rel,repr in
- let query =
+ let query1 =
let name = name_of_theorem candidate' rel' repr' in
("theorem " ^ name ^ ": \\forall A." ^ matita_of_cop "A" candidate' ^
" " ^ string_of_rel rel' ^ " " ^
- matita_of_cop "A" repr' ^ ". intros; autobatch size=8 depth=3 width=2. qed.") in
+ matita_of_cop "A" repr' ^ ".") in
+ let query2 = "intros;" in
+ let query3 = "autobatch size=8 depth=3 width=2." in
+ let query4 = "qed." in
+ let query = query1 ^ query2 ^ query3 ^ query4 in
+(*
output_string ch (query ^ "\n");
close_out ch;
+*)
+ let res = profile exec_cmds [query1; query2; query3; query4] in
+(*
let res =
(*Unix.system "../../../matitac.opt xxx.ma >> log 2>&1" = Unix.WEXITED 0*)
profile Unix.system "../../../matitac.opt xxx.ma > /dev/null 2>&1" = Unix.WEXITED 0
in
+*)
ignore (Unix.system "echo '(*' >> log.ma && cat xxx.dot >> log.ma && echo '*)' >> log.ma");
let ch = open_out_gen [Open_append] 0o0600 "log.ma" in
if res then
| (_,_,_,geq)::tl -> geq_reachable node (!geq@tl)
;;
+exception SameEquivalenceClass of set * equivalence_class * equivalence_class;;
+
let locate_using_leq to_be_considered_and_now ((repr,_,leq,geq) as node)
set start
=
aux set already_visited tl
else if repr=repr' then aux set (node'::already_visited) (!geq'@tl)
else if leq_reachable node' !leq then
- aux set (node'::already_visited) tl
+ aux set (node'::already_visited) (!geq'@tl)
+ else if (List.exists (function n -> not (geq_reachable n [node'])) !geq)
+ then
+ aux set (node'::already_visited) tl
else if test to_be_considered_and_now set SubsetEqual repr repr' then
begin
- let sup = remove node sup in
- let inf =
- if !geq' = [] then
- let inf = remove node' inf in
- if !geq = [] then
- inf@@node
+ if List.exists (function n -> n===node') !geq then
+ (* We have found two equal nodes! *)
+ raise (SameEquivalenceClass (set,node,node'))
+ else
+ begin
+ let sup = remove node sup in
+ let inf =
+ if !geq' = [] then
+ let inf = remove node' inf in
+ if !geq = [] then
+ inf@@node
+ else
+ inf
else
inf
- else
- inf
- in
- leq_transitive_closure node node';
- aux (nodes,inf,sup) (node'::already_visited) (!geq'@tl)
+ in
+ leq_transitive_closure node node';
+ aux (nodes,inf,sup) (node'::already_visited) (!geq'@tl)
+ end
end
else
aux set (node'::already_visited) tl
aux set [] start
;;
-exception SameEquivalenceClass of set * equivalence_class * equivalence_class;;
-
let locate_using_geq to_be_considered_and_now ((repr,_,leq,geq) as node)
set start
=
aux set already_visited tl
else if repr=repr' then aux set (node'::already_visited) (!leq'@tl)
else if geq_reachable node' !geq then
- aux set (node'::already_visited) tl
+ aux set (node'::already_visited) (!leq'@tl)
+ else if (List.exists (function n -> not (leq_reachable n [node'])) !leq)
+ then
+ aux set (node'::already_visited) tl
else if test to_be_considered_and_now set SupersetEqual repr repr' then
begin
if List.exists (function n -> n===node') !leq then
let node = candidate,[],leq,geq in
let nodes = nodes@[node] in
let set = nodes,inf@[node],sup@[node] in
- let start_inf,start_sup =
+ let set,start_inf,start_sup =
let repr_node =
match List.filter (fun (repr',_,_,_) -> repr=repr') nodes with
[node] -> node
| _ -> assert false
in
-inf,sup(*
- match hecandidate with
- I -> inf,[repr_node]
- | C -> [repr_node],sup
- | M -> inf,sup
-*)
+ match hecandidate,repr with
+ I, I::_ -> raise (SameEquivalenceClass (set,node,repr_node))
+ | I, _ ->
+ add_leq_arc node repr_node;
+ (nodes,remove repr_node inf@[node],sup),inf,sup
+ | C, C::_ -> raise (SameEquivalenceClass (set,node,repr_node))
+ | C, _ ->
+ add_geq_arc node repr_node;
+ (nodes,inf,remove repr_node sup@[node]),inf,sup
+ | M, M::M::_ -> raise (SameEquivalenceClass (set,node,repr_node))
+ | M, _ -> set,inf,sup
in
let set =
locate_using_leq (to_be_considered,Some repr,news) node set start_sup in
projects / helm.git / blobdiff