Changeset 12840 for branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.MonteCarloTreeSearch/MonteCarloTreeSearch.cs

Timestamp:

08/08/15 19:49:05 (9 years ago)

Author:

aballeit

Message:

#2283 Final

File:

• branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.MonteCarloTreeSearch/MonteCarloTreeSearch.cs (modified) (5 diffs)

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.MonteCarloTreeSearch/MonteCarloTreeSearch.cs

@@ -43 +43 @@
         }
 
-        public event Action<int, int> NodeSelected;
-
-        protected virtual void OnNodeSelectedChanged(int value, int selections)
-        {
-            RaiseNodeSelectedChanged(value, selections);
-        }
-
-        private void RaiseNodeSelectedChanged(int value, int selections)
-        {
-            var handler = NodeSelected;
+        public event Action<int, int> IterationFinished;
+
+        protected virtual void OnIterationFinishedChanged(int value, int selections)
+        {
+            RaiseIterationFinishedChanged(value, selections);
+        }
+
+        private void RaiseIterationFinishedChanged(int value, int selections)
+        {
+            var handler = IterationFinished;
             if (handler != null) handler(value, selections);
         }
@@ -66 +66 @@
                 goodSelections++;
             }
-
-            OnNodeSelectedChanged(goodSelections, selections);
         }
 
@@ -88 +86 @@
                         currentNode.GetChildActionInfos());
                     currentNode = currentNode.children[currentActionIndex];
-                    //selections++;
-                    //CheckSelection(currentNode, selections);
+                    selections++;
+                    CheckSelection(currentNode, selections);
                 }
 
@@ -100 +98 @@
                         currentNode.children[behaviourPolicy.SelectAction(random, currentNode.GetChildActionInfos())
                             ];
-                    //selections++;
-                    //CheckSelection(currentNode, selections);
+                    selections++;
+                    CheckSelection(currentNode, selections);
                 }
                 if (currentNode.phrase.Length <= maxLen)
@@ -108 +106 @@
                     OnSolutionEvaluated(simulatedPhrase, quality);
 
+                    OnIterationFinishedChanged(goodSelections, selections);
                     Propagate(currentNode, quality);
                 }