Changeset 10411

Timestamp:

01/28/14 17:00:19 (11 years ago)

Author:

gkronber

Message:

#2026 refactoring

File:

• branches/HeuristicLab.Problems.GPDL/CodeGenerator/MonteCarloTreeSearchCodeGen.cs (modified) (5 diffs)

branches/HeuristicLab.Problems.GPDL/CodeGenerator/MonteCarloTreeSearchCodeGen.cs

@@ -46 +46 @@
       
       if(searchTree.tries < RANDOM_TRIES || Grammar.subtreeCount[state] == 0) {
-        searchTree.tries++; // could be moved to UpdateTree
         t = SampleTreeRandom(state);
         if(Grammar.subtreeCount[state] == 0) {
@@ -65 +64 @@
       } else {
         if(Grammar.subtreeCount[state] == 1) {
-          searchTree.tries++; // could be moved to updateTree
           if(searchTree.children == null) {
             int nChildren = Grammar.transition[state].Length;
@@ -71 +69 @@
           }
           Debug.Assert(searchTree.children.Length == Grammar.transition[state].Length);
-          Debug.Assert(searchTree.tries - RANDOM_TRIES - 1 == searchTree.children.Where(c=>c!=null).Sum(c=>c.tries));
+          Debug.Assert(searchTree.tries - RANDOM_TRIES == searchTree.children.Where(c=>c!=null).Sum(c=>c.tries));
           var altIdx = SelectAlternative(searchTree);
           t = new Tree(altIdx, new Tree[1]);
@@ -133 +131 @@
       if(trees.Count == 0 || searchTree == null) return;
       var t = trees.Pop();
-      searchTree.sumQuality += quality;
-      if(quality > searchTree.bestQuality)
-        searchTree.bestQuality = quality;
-      if(searchTree.children == null) return;
-      if(t.subtrees == null) { 
-        Debug.Assert(searchTree.children.Length == 1);
-        UpdateSearchTree(searchTree.children[0], trees, quality);
-      } else if(t.altIdx==-1) {
+      if(t.altIdx == -1) {
+        // for trees with multiple sub-trees
         for(int idx = t.subtrees.Length - 1 ; idx >= 0; idx--) {
           trees.Push(t.subtrees[idx]);
@@ -146 +138 @@
         UpdateSearchTree(searchTree, trees, quality);
       } else {
-        Debug.Assert(t.subtrees.Length == 1);
-        trees.Push(t.subtrees[0]);
-        UpdateSearchTree(searchTree.children[t.altIdx], trees, quality);
+        searchTree.sumQuality += quality;
+        searchTree.tries++;
+        if(quality > searchTree.bestQuality)
+          searchTree.bestQuality = quality;
+        if(t.subtrees != null) { 
+          Debug.Assert(t.subtrees.Length == 1);
+          if(searchTree.children!=null) {
+            trees.Push(t.subtrees[0]);
+            UpdateSearchTree(searchTree.children[t.altIdx], trees, quality);
+          }
+        } else {
+          if(searchTree.children!=null) {
+            Debug.Assert(searchTree.children.Length == 1);
+            UpdateSearchTree(searchTree.children[0], trees, quality);
+          }
+        }
       }
     }