Changeset 12815 for branches/HeuristicLab.Problems.GrammaticalOptimization/Evaluation/MainWindow.xaml.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/MainWindow.xaml.cs (modified) (13 diffs)

branches/HeuristicLab.Problems.GrammaticalOptimization/Evaluation/MainWindow.xaml.cs

@@ -1 +1 @@
 using System.Collections.ObjectModel;
+using System.Security.AccessControl;
 using System.Threading;
 using System.Xml.Serialization;
@@ -32 +33 @@
         private EvaluationViewModel vm;
 
-        private DispatcherTimer updateCollectionTimer;
-
         private DrawingPage treeDrawingPage;
 
@@ -42 +41 @@
             this.DataContext = vm = new EvaluationViewModel();
             vm.MaxLen = 100;
-            vm.MaxEvaluations = 1000000;
+            vm.MaxIterations = 1000000;
             vm.NrRuns = 10;
-            vm.VerticalAxisString = "SolutionQuality";
-            vm.HorizontalAxisString = "Iteration";
         }
 
@@ -58 +55 @@
         }
 
-        private void DrawLineChart(Run run)
+        private void DrawQualityChart(Run run)
         {
             List<FoundSolution> solutions = new List<FoundSolution>(run.FoundSolutions);
@@ -76 +73 @@
 
             graph.StrokeThickness = 2;
-            graph.AddToPlotter(ChartPlotter);
+            graph.AddToPlotter(QualityChartPlotter);
+        }
+
+        private void DrawSelectionChart(Run run)
+        {
+            List<SelectionIndicator> selectionIndicators = new List<SelectionIndicator>(run.SelectionIndicators);
+
+            var ds = new EnumerableDataSource<SelectionIndicator>(selectionIndicators);
+
+            ds.SetXMapping(x => x.TotalSelections);
+            ds.SetYMapping(y => y.Indicator);
+
+            LineGraph graph = new LineGraph(ds);
+
+            graph.StrokeThickness = 2;
+            graph.AddToPlotter(SelectionChartPlotter);
         }
 
@@ -93 +105 @@
             run.StartTime = DateTime.Now;
 
-            run.Solver.Run(run.MaxEvaluations);
+            run.Solver.Run(run.MaxIterations);
 
             run.EndTime = DateTime.Now;
@@ -136 +148 @@
         {
             ButtonRun.IsEnabled = true;
-            TextBoxMaxEvaluations.IsEnabled = true;
+            TextBoxMaxIterations.IsEnabled = true;
             TextBoxMaxLen.IsEnabled = true;
             TextBoxRuns.IsEnabled = true;
@@ -162 +174 @@
                 policyInstance = new ThresholdAscentPolicy();
             }
+            else if (policy == typeof(BoltzmannExplorationPolicy))
+            {
+                policyInstance = new BoltzmannExplorationPolicy(2);
+            }
             else
             {
@@ -197 +213 @@
                 }
 
-                Run run = new Run(problem, policyInstance, solver, i + 1, vm.MaxEvaluations, vm.MaxLen);
+                Run run = new Run(problem, policyInstance, solver, i + 1, vm.MaxIterations, vm.MaxLen);
 
                 vm.Runs.Add(run);
@@ -205 +221 @@
         }
 
-        private void ClearLineChart()
-        {
-            ChartPlotter.Children.RemoveAll<LineGraph>();
+        private void ClearQualityChart()
+        {
+            QualityChartPlotter.Children.RemoveAll<LineGraph>();
         }
 
@@ -215 +231 @@
         }
 
+        private void ClearSelectionChart()
+        {
+            SelectionChartPlotter.Children.RemoveAll<LineGraph>();
+        }
+
         private void ButtonRun_OnClick(object sender, RoutedEventArgs e)
         {
-            ClearLineChart();
+            ClearQualityChart();
             ClearComparisonChart();
+            ClearSelectionChart();
 
             vm.Runs.Clear();
             vm.SelectedRun = null;
             ButtonRun.IsEnabled = false;
-            TextBoxMaxEvaluations.IsEnabled = false;
+            TextBoxMaxIterations.IsEnabled = false;
             TextBoxMaxLen.IsEnabled = false;
             TextBoxRuns.IsEnabled = false;
@@ -287 +309 @@
                 vm.SelectedRun.Solver.FoundNewBestSolution += SelectedRun_FoundNewBestSolution;
 
-                ClearLineChart();
-                DrawLineChart(vm.SelectedRun);
+                ClearQualityChart();
+                DrawQualityChart(vm.SelectedRun);
+
+                if (vm.SelectedRun.RunState == RunState.Finished)
+                {
+                    ClearSelectionChart();
+                    DrawSelectionChart(vm.SelectedRun);
+                }
                 //DrawTreeChart(vm.SelectedRun);
             }
@@ -301 +329 @@
             Dispatcher.BeginInvoke(new Action(() =>
             {
-                ClearLineChart();
-                DrawLineChart(vm.SelectedRun);
+                ClearQualityChart();
+                DrawQualityChart(vm.SelectedRun);
             }));
         }