Important: added special variable "Z" for zero.

[fireball-separation.git] / ocaml / test.ml

diff --git a/ocaml/test.ml b/ocaml/test.ml
index f5bf55a50280c7ac20c3048761d8f0e9bc984065..da6dbda7a7f813e0496ccb3d31d2647b4982c42f 100644 (file)
--- a/ocaml/test.ml
+++ b/ocaml/test.ml
@@ -1,4 +1,5 @@
 open Lambda4;;
+open Util;;
 
 let acaso l =
     let n = Random.int (List.length l) in
@@ -57,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.solve (Lambda4.problem_of 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 =
@@ -80,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
   ;