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

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

Revision: 1372
          http://toss.svn.sourceforge.net/toss/?rev=1372&view=rev
Author:   lukaszkaiser
Date:     2011-03-20 16:56:34 +0000 (Sun, 20 Mar 2011)

Log Message:
-----------
Correct looping in Heuristic.

Modified Paths:
--------------
    trunk/Toss/GGP/Makefile
    trunk/Toss/Play/Heuristic.ml
    trunk/Toss/www/navigation.xml

Modified: trunk/Toss/GGP/Makefile
===================================================================
--- trunk/Toss/GGP/Makefile	2011-03-19 19:24:33 UTC (rev 1371)
+++ trunk/Toss/GGP/Makefile	2011-03-20 16:56:34 UTC (rev 1372)
@@ -16,12 +16,12 @@
 GDLTestDebug:
 
 %.black: examples/%.gdl ../TossServer
-	OCAMLRUNPARAM=b; export OCAMLRUNPARAM; ../TossServer -vv &
+	OCAMLRUNPARAM=b; export OCAMLRUNPARAM; ../TossServer -d 2 &
 	java -jar gamecontroller-cli.jar play $< 600 10 1 -random 1 -remote 2 toss localhost 8110 1 | grep results
 	killall -v TossServer
 
 %.white: examples/%.gdl ../TossServer
-	OCAMLRUNPARAM=b; export OCAMLRUNPARAM; ../TossServer -vv &
+	OCAMLRUNPARAM=b; export OCAMLRUNPARAM; ../TossServer -d 2 &
 	java -jar gamecontroller-cli.jar play $< 600 10 1 -random 2 -remote 1 toss localhost 8110 1 | grep results
 	killall -v TossServer
 

Modified: trunk/Toss/Play/Heuristic.ml
===================================================================
--- trunk/Toss/Play/Heuristic.ml	2011-03-19 19:24:33 UTC (rev 1371)
+++ trunk/Toss/Play/Heuristic.ml	2011-03-20 16:56:34 UTC (rev 1372)
@@ -623,6 +623,7 @@
     List.filter (fun (rel,_) -> not (Strings.mem rel frels)) rels in  
   let rec aux all_vars = function
     | Rel _ | Eq _ | In _ as phi -> phi
+    | Not (Rel _) | Not (Eq _) | Not (In _) as phi -> phi
     | Not psi -> aux all_vars (FormulaOps.nnf ~neg:true psi) 
     | Or phis -> Or (List.map (aux all_vars) phis)
     | And phis (* as phi when (has_rels frels phi) *) ->

Modified: trunk/Toss/www/navigation.xml
===================================================================
--- trunk/Toss/www/navigation.xml	2011-03-19 19:24:33 UTC (rev 1371)
+++ trunk/Toss/www/navigation.xml	2011-03-20 16:56:34 UTC (rev 1372)
@@ -4,7 +4,7 @@
 <navigation>
 <menu lang="en">
   <item href="/" id="Home">Home</item>
-  <item href="/ideas.html" id="ideas">GSoC Ideas</item>
+  <!-- <item href="/ideas.html" id="ideas">GSoC Ideas</item> -->
   <item href="http://tplay.org">Play Online</item>
   <item href="http://sourceforge.net/project/showfiles.php?group_id=115606"
 	>Download Toss</item>
@@ -27,7 +27,7 @@
 
 <menu lang="de">
   <item href="/" id="Home">Home</item>
-  <item href="/ideas.html" id="ideas">GSoC Ideen</item>
+  <!-- <item href="/ideas.html" id="ideas">GSoC Ideen</item> -->
   <item href="http://tplay.org">Online Spielen</item>
   <item href="http://sourceforge.net/project/showfiles.php?group_id=115606"
 	>Toss Runterladen</item>
@@ -50,7 +50,7 @@
 
 <menu lang="pl">
   <item href="/" id="Home">Strona Domowa</item>
-  <item href="/ideas.html" id="ideas">Pomysły na GSoC</item>
+  <!-- <item href="/ideas.html" id="ideas">Pomysły na GSoC</item> -->
   <item href="http://tplay.org">Graj Online</item>
   <item href="http://sourceforge.net/project/showfiles.php?group_id=115606"
 	>Ściągnij Tossa</item>
@@ -73,7 +73,7 @@
 
 <menu lang="fr">
   <item href="/" id="Home">Accueil</item>
-  <item href="/ideas.html" id="ideas">Idées GSoC</item>
+  <!-- <item href="/ideas.html" id="ideas">Idées GSoC</item> -->
   <item href="http://tplay.org">Jouez en Ligne</item>
   <item href="http://sourceforge.net/project/showfiles.php?group_id=115606"
 	>Téléchargez Toss</item>


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