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

Timestamp:

07/30/15 16:37:14 (9 years ago)

Author:

aballeit

Message:

#2283 added SelectionIndicator for MCTS and problems SantaFeAnt, SymbolicRegression10, RoyalSymbol; updated SantaFeAnt grammar

File:

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

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

@@ -1 +1 @@
 using HeuristicLab.Algorithms.Bandits;
 using HeuristicLab.Algorithms.GrammaticalOptimization;
+using HeuristicLab.Algorithms.MonteCarloTreeSearch;
 using HeuristicLab.Algorithms.MonteCarloTreeSearch.Base;
 using HeuristicLab.Problems.GrammaticalOptimization;
@@ -26 +27 @@
 
         public Run(ISymbolicExpressionTreeProblem problem, IBanditPolicy banditPolicy, ISolver solver, int runNumber,
-            int maxEvaluations, int maxLen)
+            int maxIterations, int maxLen)
         {
             Problem = problem;
@@ -32 +33 @@
             Solver = solver;
             RunNumber = runNumber;
-            MaxEvaluations = maxEvaluations;
+            MaxIterations = maxIterations;
             MaxLen = maxLen;
 
+            selectionIndicators = new List<SelectionIndicator>();
             Evaluations = 0;
             BestQuality = double.MinValue;
             RunState = RunState.NotStarted;
             FoundSolutions = new List<FoundSolution>();
+            CurrentSelectionIndicator = new SelectionIndicator(0, 0);
 
             BestKnownQuality = problem.BestKnownQuality(maxLen);
@@ -52 +55 @@
                 }
             };
+            if (solver is MonteCarloTreeSearch)
+            {
+                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);
+        }
+
+        private List<SelectionIndicator> selectionIndicators;
+
+        public List<SelectionIndicator> SelectionIndicators { get { return selectionIndicators; } }
+
+
+        private SelectionIndicator currentSelectionIndicator;
+
+        public SelectionIndicator CurrentSelectionIndicator
+        {
+            get { return this.currentSelectionIndicator; }
+            set { this.currentSelectionIndicator = value; this.OnPropertyChanged("CurrentSelectionIndicator"); }
         }
 
@@ -102 +132 @@
         }
 
-        private int maxEvaluations;
-
-        public int MaxEvaluations
-        {
-            get { return this.maxEvaluations; }
-            set
-            {
-                this.maxEvaluations = value;
-                this.OnPropertyChanged("MaxEvaluations");
+        private int maxIterations;
+
+        public int MaxIterations
+        {
+            get { return this.maxIterations; }
+            set
+            {
+                this.maxIterations = value;
+                this.OnPropertyChanged("MaxIterations");
             }
         }
@@ -297 +327 @@
         protected void OnPropertyChanged(string propertyName)
         {
-            if (PropertyChanged != null)
-                this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            try
+            {
+                if (PropertyChanged != null)
+                    this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            }
+            catch (Exception) { }
         }