X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=ocaml%2Ftest.ml;h=da6dbda7a7f813e0496ccb3d31d2647b4982c42f;hb=b9e5cc50618b83f4069608c62be8c4a173c9446f;hp=ed41f7ac684c6188b18fc25c84620fdae340939e;hpb=f804e82c47ca8a25f3044ae630988af4b8da7b25;p=fireball-separation.git

diff --git a/ocaml/test.ml b/ocaml/test.ml
index ed41f7a..da6dbda 100644
--- a/ocaml/test.ml
+++ b/ocaml/test.ml
@@ -1,13 +1,5 @@
-let three = Array.length Sys.argv = 1;;
-
-let discriminator =
- (* if three *)
- (* then (module Lambda3 : Discriminator.Discriminator) *)
- (* else *)
- (module Lambda4 : Discriminator.Discriminator);;
-
-module Pippo = (val discriminator);;
-open Pippo;;
+open Lambda4;;
+open Util;;
 
 let acaso l =
     let n = Random.int (List.length l) in
@@ -66,12 +58,14 @@ let rec repeat f n =
   ) in Lambda3.main [Lambda3.magic tms ["*"]]
 ;; *)
 let call_main4 div convs nums =
-  let _ = (
-  (match div with Some div -> prerr_endline ("DIV: " ^ div) | None -> ());
-  print_endline "CONV:"; List.iter prerr_endline convs;
-  print_endline "NUMS:"; List.iter prerr_endline nums;
-  prerr_newline ();
-  ) in Lambda4.main [Lambda4.magic_conv div convs nums ["*"]]
+ let p = String.concat "\n" (
+  "$! randomly generated test" ::
+  ("D " ^ div) ::
+  List.map ((^) "C ") convs @
+  List.map (fun s -> "N " ^ s ^ " Z") nums
+ ) in
+ prerr_endline p;
+ (Lambda4.solve ++ Lambda4.problem_of ++ Parser.problem_of_string) p
 ;;
 
 let main =
@@ -89,7 +83,7 @@ let main =
   else *)
   repeat (fun _ ->
     let div, (conv, nums) = test4 complex vars in
-    call_main4 (Some div) conv nums
+    call_main4 div conv nums
   ) num
   ;