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

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

Revision: 1626
          http://toss.svn.sourceforge.net/toss/?rev=1626&view=rev
Author:   lukaszkaiser
Date:     2011-11-10 23:59:43 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
Corrections to compile on older OCaml 3.11.

Modified Paths:
--------------
    trunk/Toss/Arena/ContinuousRule.ml
    trunk/Toss/GGP/TranslateGame.ml
    trunk/Toss/Play/Heuristic.ml
    trunk/Toss/Server/LearnGame.ml

Modified: trunk/Toss/Arena/ContinuousRule.ml
===================================================================
--- trunk/Toss/Arena/ContinuousRule.ml	2011-11-10 01:26:59 UTC (rev 1625)
+++ trunk/Toss/Arena/ContinuousRule.ml	2011-11-10 23:59:43 UTC (rev 1626)
@@ -30,7 +30,8 @@
   let inv = FormulaSubst.subst_rels defs inv in
   let post = FormulaSubst.subst_rels defs post in
   (*let obj = DiscreteRule.compile_rule signat defs discrete in*)
-  { discrete; dynamics; update; inv; post; }
+  { discrete = discrete; dynamics = dynamics; update = update;
+    inv = inv; post = post; }
 
 
 
@@ -52,7 +53,7 @@
         else
           { struc_r with DiscreteRule.rhs_struc = res_struc } in
       let discrete = DiscreteRule.compile_rule signat defs struc_r in
-      {r with discrete}
+      {r with discrete = discrete}
   
 let lhs r =
   match r.discrete.DiscreteRule.struc_rule with

Modified: trunk/Toss/GGP/TranslateGame.ml
===================================================================
--- trunk/Toss/GGP/TranslateGame.ml	2011-11-10 01:26:59 UTC (rev 1625)
+++ trunk/Toss/GGP/TranslateGame.ml	2011-11-10 23:59:43 UTC (rev 1626)
@@ -2604,12 +2604,12 @@
   let del_tuples = Aux.collect del in
   let discrete = {
     DiscreteRule.struc_rule = None;
-    lhs_vars;
-    rhs_vars;
-    add_tuples;
-    del_tuples;
-    match_formula = precond;
-    rlmap = None
+    DiscreteRule.lhs_vars = lhs_vars;
+    DiscreteRule.rhs_vars = rhs_vars;
+    DiscreteRule.add_tuples = add_tuples;
+    DiscreteRule.del_tuples = del_tuples;
+    DiscreteRule.match_formula = precond;
+    DiscreteRule.rlmap = None
   } in
   let rule =
     ContinuousRule.make_rule [] discrete [] updates () in

Modified: trunk/Toss/Play/Heuristic.ml
===================================================================
--- trunk/Toss/Play/Heuristic.ml	2011-11-10 01:26:59 UTC (rev 1625)
+++ trunk/Toss/Play/Heuristic.ml	2011-11-10 23:59:43 UTC (rev 1626)
@@ -1075,8 +1075,9 @@
 
 let use_monotonic = ref true
 
-let default_heuristic_old ?struc ?advr
-    ({Arena.rules; graph; starting_struc} as game) =
+let default_heuristic_old ?struc ?advr game =
+  let (rules, graph, starting_struc) = 
+    (game.Arena.rules, game.Arena.graph, game.Arena.starting_struc) in
   (* TODO: cache the default heuristic in game definition or state *)
   let drules =
     List.map (fun r -> (snd r).ContinuousRule.discrete) rules in

Modified: trunk/Toss/Server/LearnGame.ml
===================================================================
--- trunk/Toss/Server/LearnGame.ml	2011-11-10 01:26:59 UTC (rev 1625)
+++ trunk/Toss/Server/LearnGame.ml	2011-11-10 23:59:43 UTC (rev 1626)
@@ -22,12 +22,14 @@
   Distinguish.distinguish winningStates notWinningStates
 
 let cleanStructure struc =
-  let funs = List.map fst (Structure.StringMap.bindings (Structure.functions struc)) in
+  let funs = ref [] in
+  let append_fun f _ = funs := f :: !funs in
+  Structure.StringMap.iter append_fun (Structure.functions struc);
   let struc = StructureParser.parse_structure Lexer.lex (Lexing.from_string  (Structure.str struc)) in
   Structure.replace_names (List.fold_left
     (fun x y ->
       Structure.clear_fun x y)
-    struc funs) Structure.StringMap.empty
+    struc !funs) Structure.StringMap.empty
   Structure.IntMap.empty 
 
 

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