Changeset 12762 for branches/HeuristicLab.Problems.GrammaticalOptimization/Evaluation/ViewModel

Timestamp:

07/14/15 20:42:55 (10 years ago)

Author:

aballeit

Message:

#2283 GUI updates, Tree-chart, MCTS Version 2 (prune leaves)

Location:

branches/HeuristicLab.Problems.GrammaticalOptimization/Evaluation/ViewModel

Files:

• EvaluationStat.cs (deleted)
• EvaluationViewModel.cs (modified) (6 diffs)

branches/HeuristicLab.Problems.GrammaticalOptimization/Evaluation/ViewModel/EvaluationViewModel.cs

@@ -1 @@
-using HeuristicLab.Algorithms.Bandits.BanditPolicies;
+using System.Collections.ObjectModel;
+using HeuristicLab.Algorithms.Bandits.BanditPolicies;
 using HeuristicLab.Algorithms.GeneticProgramming;
 using HeuristicLab.Algorithms.GrammaticalOptimization;
@@ -108 +109 @@
         }
 
-        private long evaluations;
-
-        public long Evaluations
+        private int evaluations;
+
+        public int Evaluations
         {
             get { return this.evaluations; }
@@ -120 +121 @@
         }
 
+        private int nrRuns;
+
+        public int NrRuns
+        {
+            get { return this.nrRuns; }
+            set { this.nrRuns = value; this.OnPropertyChanged("NrRuns"); }
+        }
+
+        private int threads;
+
+        public int Threads
+        {
+            get { return this.threads; }
+            set { this.threads = value; this.OnPropertyChanged("Threads"); }
+        }
+
         private int maxLen;
 
@@ -176 +193 @@
         }
 
+        private string currentRunString;
+
+        public string CurrentRunString
+        {
+            get { return this.currentRunString; }
+            set
+            {
+                currentRunString = value;
+                this.OnPropertyChanged("CurrentRunString");
+            }
+        }
+
         private double evaluationsPerSec;
 
@@ -188 +217 @@
         }
 
-        private long bestSolutionFoundAt;
-
-        public long BestSolutionFoundAt
+        private int bestSolutionFoundAt;
+
+        public int BestSolutionFoundAt
         {
             get { return this.bestSolutionFoundAt; }
@@ -197 +226 @@
                 bestSolutionFoundAt = value;
                 this.OnPropertyChanged("BestSolutionFoundAt");
+            }
+        }
+
+        private string bestSolution;
+
+        public string BestSolution
+        {
+            get { return this.bestSolution; }
+            set
+            {
+                bestSolution = value;
+                this.OnPropertyChanged("BestSolution");
+            }
+        }
+
+        private ObservableCollection<Run> runs = new ObservableCollection<Run>();
+
+        public ObservableCollection<Run> Runs
+        {
+            get { return this.runs; }
+            set
+            {
+                runs = value;
+                this.OnPropertyChanged("Runs");
+            }
+        }
+
+        private Run currentRun;
+
+        public Run CurrentRun
+        {
+            get { return this.currentRun; }
+            set
+            {
+                currentRun = value;
+                if (currentRun != null)
+                {
+                    Evaluations = currentRun.Evaluations;
+                    BestKnownQuality = currentRun.BestKnownQuality;
+                    CurrentBestQuality = currentRun.BestSolutionQuality;
+                    EvaluationsPerSec = currentRun.EvaluationsPerSecond;
+                }
+                this.OnPropertyChanged("CurrentRun");
             }
         }