Changeset 12840 for branches/HeuristicLab.Problems.GrammaticalOptimization/Evaluation/Run.cs

Timestamp:

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

Author:

aballeit

Message:

#2283 Final

File:

• branches/HeuristicLab.Problems.GrammaticalOptimization/Evaluation/Run.cs (modified) (3 diffs)

branches/HeuristicLab.Problems.GrammaticalOptimization/Evaluation/Run.cs

@@ -1 @@
-using HeuristicLab.Algorithms.Bandits;
+using System.Diagnostics;
+using HeuristicLab.Algorithms.Bandits;
 using HeuristicLab.Algorithms.GrammaticalOptimization;
 using HeuristicLab.Algorithms.MonteCarloTreeSearch;
@@ -41 +42 @@
             RunState = RunState.NotStarted;
             FoundSolutions = new List<FoundSolution>();
-            CurrentSelectionIndicator = new SelectionIndicator(0, 0);
+            CurrentSelectionIndicator = new SelectionIndicator(0, 0, 0);
 
             BestKnownQuality = problem.BestKnownQuality(maxLen);
@@ -60 +61 @@
             {
                 MonteCarloTreeSearch mcts = (MonteCarloTreeSearch)solver;
-                mcts.NodeSelected += mcts_NodeSelected;
-            }
-        }
-
-        private void mcts_NodeSelected(int goodSelections, int totalSelections)
-        {
-            CurrentSelectionIndicator.GoodSelections = goodSelections;
-            CurrentSelectionIndicator.TotalSelections = totalSelections;
-            this.OnPropertyChanged("CurrentSelectionIndicator");
-            //CurrentSelectionIndicator = new SelectionIndicator(goodSelections, totalSelections);
-            //selectionIndicators.Add(CurrentSelectionIndicator);
+                mcts.IterationFinished += mcts_IterationFinished;
+            }
+        }
+
+        private void mcts_IterationFinished(int goodSelections, int totalSelections)
+        {
+            //CurrentSelectionIndicator.GoodSelections = goodSelections;
+            //CurrentSelectionIndicator.TotalSelections = totalSelections;
+            //this.OnPropertyChanged("CurrentSelectionIndicator");
+            CurrentSelectionIndicator = new SelectionIndicator(goodSelections, totalSelections, selectionIndicators.Count);
+            selectionIndicators.Add(CurrentSelectionIndicator);
         }