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

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

Revision: 1234
          http://toss.svn.sourceforge.net/toss/?rev=1234&view=rev
Author:   lukstafi
Date:     2010-12-07 17:49:54 +0000 (Tue, 07 Dec 2010)

Log Message:
-----------
Recent make_rule bug fixed.

Modified Paths:
--------------
    trunk/Toss/Arena/ContinuousRule.ml
    trunk/Toss/Play/GameTest.ml

Modified: trunk/Toss/Arena/ContinuousRule.ml
===================================================================
--- trunk/Toss/Arena/ContinuousRule.ml	2010-12-07 16:19:19 UTC (rev 1233)
+++ trunk/Toss/Arena/ContinuousRule.ml	2010-12-07 17:49:54 UTC (rev 1234)
@@ -34,7 +34,9 @@
   let discrete = { discr with DiscreteRule.pre = cpre } in
   let defrels = List.map (fun (rel,(args,body)) ->
     rel, (args, body, Solver.M.register_formula body)) defs in
-  let obj = DiscreteRule.compile_rule signat defrels discr in
+  (* we use [discrete] instead of [discr] because parser does not
+     insert precondition into discr! *)
+  let obj = DiscreteRule.compile_rule signat defrels discrete in
   { discrete = discrete;
     compiled = obj ;
     dynamics = dynamics ;

Modified: trunk/Toss/Play/GameTest.ml
===================================================================
--- trunk/Toss/Play/GameTest.ml	2010-12-07 16:19:19 UTC (rev 1233)
+++ trunk/Toss/Play/GameTest.ml	2010-12-07 17:49:54 UTC (rev 1234)
@@ -1096,7 +1096,7 @@
     );
 ]
 
-let a () =
+let a =
   Aux.run_test_if_target "GameTest" tests
 
 let a () = run_test_tt ~verbose:true experiments
@@ -1109,7 +1109,7 @@
 let a () =
   Game.set_debug_level 7
 
-let a =
+let a () =
   match test_filter
     ["Game:0:misc:2:breakthrough payoff"]
     tests


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