X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=ocaml%2Fproblems.ml;h=8a1915c76769665e728098ae4ab636c8d4c9af4b;hb=a5d76aabf64c2226b8bd8084be02f140f48c767b;hp=a11453d28119478f9fbb438f97e6f8775686738b;hpb=0991fc5486c3158fc361e84cbba5aefa67893ba4;p=fireball-separation.git

diff --git a/ocaml/problems.ml b/ocaml/problems.ml
index a11453d..8a1915c 100644
--- a/ocaml/problems.ml
+++ b/ocaml/problems.ml
@@ -210,7 +210,7 @@ let q2 () = problem_of
  ;;
 
 let q3 () = problem_of
- (Some "x")
+ (Some "x y")
  ["a d e f"]
  ["a b" ]
  ;;
@@ -222,13 +222,13 @@ let q4 () = problem_of
  ;;
 
 let q5 () = problem_of
- (Some"x")
+ (Some"x y")
  ["(y. x)"]
  ["x"]
  ;;
 
 let q6 () = problem_of
- (Some"x")
+ (Some"x w")
  ["(y. x z)"]
  ["y"]
  ;;
@@ -352,9 +352,9 @@ solve_many (List.map ((|>) ()) [
  o1; o2; o3; o4; o5; o6
 ]);;
 
-should_fail(fun () -> problem_of None ["BOT"] []);;
+(*should_fail(fun () -> problem_of None ["BOT"] []);;
 should_fail(fun () -> problem_of (Some"x y") ["x BOMB"] []);;
-should_fail(fun () -> problem_of (Some"x y z") ["x BOMB z"; "x y y"] []);;
+should_fail(fun () -> problem_of (Some"x y z") ["x BOMB z"; "x y y"] []);;*)
 
 solve_many [
  problem_of
@@ -376,7 +376,8 @@ solve_many [
    (* 2 *) "b c d (k. e k) (e e (b (k. l. b)) d (k. d)) (f g (c (e h))) (d b (k. b) (f g (e f))) (c (e h)) (e e (b (k. l. b)) (k. e k)) (k. l. c (k h)) a";
    (* 3 *) "b c d (k. e k) (e e (b (k. l. b)) d (k. d)) (f g (c (e h))) (d b (k. b) (f g (e f))) (c (e h)) (e e (b (k. l. b)) (k. e k)) (k. l. c (k h)) (d b (b c d (k. c (k h))) (b c d (k. e k) (b c))) a";
    (* 4 *) "b c d (k. e k) (e e (b (k. l. b)) d (k. d)) (f g (c (e h))) (d b (k. b) (f g (e f))) (c (e h)) (e e (b (k. l. b)) (k. e k)) (k. b k d (l. e l) (e e (b (l. m. b)) d (l. d)) (f g (k (e h)))) a";
- ]; problem_of
+ ];
+ (*problem_of
  (* DISPLAY PROBLEM (main) - measure=561
     Discriminating sets (deltas):
     0 <> 1 <> 2 <> 3 <> 4
@@ -394,10 +395,10 @@ solve_many [
    (* 2 *) "e f (k. k) (g e) (e f (k. e)) (h (k. g e (g e)) (h (k. g e (g e)))) (k. d) a";
    (* 3 *) "e f (k. k) (g e) (e f (k. e)) (h (k. g e (g e)) (h (k. g e (g e)))) (k. d) (k. l. m. c k) a";
    (* 4 *) "g (k. e f g) (k. h c) (b (g e) h (k. c (l. m. m k l))) (k. c b g) (k. e f (l. l) (g e) (e f (l. e))) f a";
- ]
+ ]*)
 ];;
 
-failwith "OKAy";;
+(*failwith "OKAy";;*)
 
 solve_many ([
  p2 ; p4 ; p5 ; p6 ; p7 ; p8 ; p9 ; p10 ; p11 ; p12 ; p13 ;