Changeset 12840 for branches/HeuristicLab.Problems.GrammaticalOptimization/Evaluation/MainWindow.xaml.cs

Timestamp:

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

Author:

aballeit

Message:

#2283 Final

File:

• branches/HeuristicLab.Problems.GrammaticalOptimization/Evaluation/MainWindow.xaml.cs (modified) (8 diffs)

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

@@ -5 +5 @@
 using System.Threading.Tasks;
 using System.Windows.Documents;
+using System.Windows.Media;
 using System.Xml.Serialization;
 using Evaluation.ViewModel;
@@ -43 +44 @@
             CenterWindowOnScreen();
             this.DataContext = vm = new EvaluationViewModel();
-            vm.MaxLen = 23;
-            vm.MaxIterations = 500000;
+            vm.MaxLen = 17;
+            vm.MaxIterations = 300000;
             vm.NrRuns = 20;
-            vm.MaxThreads = 5;
+            vm.MaxThreads = 10;
         }
 
@@ -72 +73 @@
 
             ds.SetXMapping(x => x.Iteration);
-            ds.SetYMapping(y => y.Quality);
+            ds.SetYMapping(y => y.Quality / run.BestKnownQuality);
 
             LineGraph graph = new LineGraph(ds);
@@ -82 +83 @@
         private void DrawSelectionChart(Run run)
         {
+            // quality line
+            List<FoundSolution> solutions = new List<FoundSolution>(run.FoundSolutions);
+
+            if (run.BestSolutionFoundAt < run.Evaluations)
+            {
+                solutions.Add(new FoundSolution(run.EndTime, run.Evaluations, run.BestQuality, run.BestSolution));
+            }
+
+            var ds = new EnumerableDataSource<FoundSolution>(solutions);
+
+
+            ds.SetXMapping(x => x.Iteration);
+            ds.SetYMapping(y => y.Quality / run.BestKnownQuality);
+
+            LineGraph graph = new LineGraph(ds);
+            graph.StrokeThickness = 2;
+            graph.AddToPlotter(SelectionChartPlotter);
+
+            // selection indicator line
             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);
-
+            var dssi = new EnumerableDataSource<SelectionIndicator>(selectionIndicators);
+
+            dssi.SetXMapping(x => x.Evaluation);
+            dssi.SetYMapping(y => y.Indicator);
+
+            graph = new LineGraph(dssi);
             graph.StrokeThickness = 2;
+            graph.Stroke = Brushes.Red;
             graph.AddToPlotter(SelectionChartPlotter);
         }
@@ -182 +202 @@
                 policyInstance = new BoltzmannExplorationPolicy(2);
             }
-            else if (policy == typeof (EpsGreedyPolicy))
+            else if (policy == typeof(EpsGreedyPolicy))
             {
                 policyInstance = new EpsGreedyPolicy(vm.Epsylon);
@@ -228 +248 @@
             }
             Task.Run(() =>
-                Parallel.For(0, vm.NrRuns, new ParallelOptions {MaxDegreeOfParallelism = vm.MaxThreads},
+                Parallel.For(0, vm.NrRuns, new ParallelOptions { MaxDegreeOfParallelism = vm.MaxThreads },
                     i => DoRun(vm.Runs[i])));
         }
@@ -434 +454 @@
         private void ComboBoxPolicies_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (vm.SelectedPolicy == typeof (EpsGreedyPolicy))
+            if (vm.SelectedPolicy == typeof(EpsGreedyPolicy))
             {
                 TextBoxEpsylon.Visibility = Visibility.Visible;
@@ -445 +465 @@
             }
         }
+
+        private void Selector_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (ChartSelector.SelectedItem == TabSelectionIndicator)
+            {
+                if (vm.SelectedRun != null)
+                {
+                    if (vm.SelectedRun.RunState == RunState.Finished)
+                    {
+                        ClearSelectionChart();
+                        DrawSelectionChart(vm.SelectedRun);
+                    }
+                }
+            }
+            else if (ChartSelector.SelectedItem == TabQualityChart)
+            {
+                if (vm.SelectedRun != null)
+                {
+                    if (vm.SelectedRun.RunState == RunState.Finished)
+                    {
+                        ClearQualityChart();
+                        DrawQualityChart(vm.SelectedRun);
+                    }
+                }
+            }
+        }
     }
 }