[Toss-devel-svn] SF.net SVN: toss:[1600] trunk/Toss

[<luk...@us...>]

Revision: 1600
          http://toss.svn.sourceforge.net/toss/?rev=1600&view=rev
Author:   lukaszkaiser
Date:     2011-10-18 14:30:27 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
First attempt to use WL in PictureTest.

Modified Paths:
--------------
    trunk/Toss/Server/Picture.ml
    trunk/Toss/Server/def_pics/Makefile
    trunk/Toss/Solver/WLTest.ml

Modified: trunk/Toss/Server/Picture.ml
===================================================================
--- trunk/Toss/Server/Picture.ml	2011-10-17 22:44:40 UTC (rev 1599)
+++ trunk/Toss/Server/Picture.ml	2011-10-18 14:30:27 UTC (rev 1600)
@@ -256,8 +256,8 @@
   let crels = List.filter not_drel (Structure.rel_signature left) in
   if !debug_level > 0 then Printf.printf "CRels %i\n%!" (List.length crels);
   let tp = postp left crels delems in
-  if !debug_level > 0 then 
-    Format.printf "@[%a@]@ \n%!" Formula.fprint (Formula.And tp);
+  if !debug_level > -1 then
+    Format.eprintf "@[%a@]@ \n%!" Formula.fprint (Formula.And tp);
   let cut s = List.fold_left Structure.del_elem s
     (List.filter (fun e -> not (List.mem e delems)) (Structure.elements s)) in
   (cut left, cut right, tp)
@@ -358,8 +358,11 @@
 	Formula.flatten (if ok f0 then f0 else if ok f1 then f1 else f) in
       List.fold_left mini phi atoms in
     let mw = List.map minimize w in
-    if !debug_level > 0 then 
-      Format.printf "@[%a@]@ \n%!" Formula.fprint (Formula.And mw);
+    if !debug_level > -1 then 
+      Format.eprintf "@[%a@]@ \n%!" Formula.fprint (Formula.And (basic :: mw));
+    (*if !debug_level > -1 then 
+      Format.eprintf "@[%a@]@ \n%!" Formula.fprint 
+	(Aux.unsome (WL.distinguish_by_type ~qr:1 ~k:2 right wrong));*)
     Formula.flatten (Formula.Ex (ex_vars, Formula.And (basic :: mw)))
   )
 

Modified: trunk/Toss/Server/def_pics/Makefile
===================================================================
--- trunk/Toss/Server/def_pics/Makefile	2011-10-17 22:44:40 UTC (rev 1599)
+++ trunk/Toss/Server/def_pics/Makefile	2011-10-18 14:30:27 UTC (rev 1600)
@@ -15,6 +15,7 @@
 	    Breakthrough09.ppm Breakthrough10.ppm Breakthrough11.ppm \
 	    Breakthrough12.ppm BreakthroughWin100.ppm BreakthroughWin101.ppm \
 	    BreakthroughWin200.ppm BreakthroughWin201.ppm
+	make -C ../.. Server/PictureTest.native
 	OCAMLRUNPARAM=b; export OCAMLRUNPARAM; ../../PictureTest.native -tp \
 	  -g Breakthrough | sed "s/P1/B/g" | sed "s/P2/W/g" > Breakthrough.toss
 

Modified: trunk/Toss/Solver/WLTest.ml
===================================================================
--- trunk/Toss/Solver/WLTest.ml	2011-10-17 22:44:40 UTC (rev 1599)
+++ trunk/Toss/Solver/WLTest.ml	2011-10-18 14:30:27 UTC (rev 1600)
@@ -86,5 +86,43 @@
       not R(x1, x1) and not R(x1, x2) and not x1 = x2 and not R(x2, x2)))"
 	(WL.distinguish_by_type ~skip_outer_exists:true ~qr:1 ~k:2
 	   structure1 structure2);
+      let struc1 = struc_of_string "[  |  |  ] \"
+	   ...   ...   ...   ...
+	   B..   W..   ...   ...
+	...   ...   ...   ...   
+	...B  ...   ...   ...   
+	   ...   ...   ...   ...
+	   ...   ...   ...   ...
+	...   ...   ...   ...   
+	...   ...   ...   ...   
+	   ...   ...   ...   ...
+	   ...   ...   ...   ...
+	...   ...   ...   ...   
+	...   ...   ...   ...   
+	   ...   ...   ...   ...
+	   ...   ...   ...   W..
+	...   ...   ...   ...   
+	...W  ...   ...   ...   
+\"" in
+      let struc2 = struc_of_string "[  |  |  ] \"
+	   ...   ...   ...   ...
+	   B..   ...   ...   ...
+	...   ...   ...   ...   
+	...B  ...W  ...   ...   
+	   ...   ...   ...   ...
+	   ...   ...   ...   ...
+	...   ...   ...   ...   
+	...   ...   ...   ...   
+	   ...   ...   ...   ...
+	   ...   ...   ...   ...
+	...   ...   ...   ...   
+	...   ...   ...   ...   
+	   ...   ...   ...   ...
+	   ...   ...   ...   W..
+	...   ...   ...   ...   
+	...W  ...   ...   ...   
+\"" in
+      formula_option_eq "None"
+	(WL.distinguish_by_type ~qr:1 ~k:1 struc1 struc2);
     );
 ]

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.