Changeset 15993 for branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/Analysis

Timestamp:

07/11/18 10:34:21 (6 years ago)

Author:

bburlacu

Message:

#2886: refactor code

File:

• branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/Analysis/RSquaredEvaluator.cs (modified) (7 diffs)

branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/Analysis/RSquaredEvaluator.cs

@@ -2 +2 @@
 using System.Diagnostics;
 using HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration.GrammarEnumeration;
+using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -20 +21 @@
     public static readonly string BestTrainingSolutionResultName = "Best solution (Training)";
     public static readonly string BestComplexityResultName = "Best solution complexity";
+    public static readonly string BestSolutions = "Best solutions";
 
     private static readonly ISymbolicDataAnalysisExpressionTreeInterpreter expressionTreeLinearInterpreter = new SymbolicDataAnalysisExpressionTreeLinearInterpreter();
-
-    public bool OptimizeConstants { get; set; }
 
     public RSquaredEvaluator() { }
@@ -31 +31 @@
 
     protected RSquaredEvaluator(RSquaredEvaluator original, Cloner cloner) : base(original, cloner) {
-      this.OptimizeConstants = original.OptimizeConstants;
     }
 
@@ -52 +51 @@
     private void AlgorithmOnDistinctSentenceGenerated(object sender, PhraseAddedEventArgs phraseAddedEventArgs) {
       GrammarEnumerationAlgorithm algorithm = (GrammarEnumerationAlgorithm)sender;
-      EvaluateSentence(algorithm, phraseAddedEventArgs.NewPhrase);
+      EvaluateSentence(algorithm, phraseAddedEventArgs.NewPhrase, algorithm.OptimizeConstants);
     }
 
@@ -70 +69 @@
     }
 
-    private void EvaluateSentence(GrammarEnumerationAlgorithm algorithm, SymbolString symbolString) {
+    private void EvaluateSentence(GrammarEnumerationAlgorithm algorithm, SymbolString symbolString, bool optimizeConstants) {
       var results = algorithm.Results;
       var grammar = algorithm.Grammar;
@@ -78 +77 @@
       Debug.Assert(SymbolicRegressionConstantOptimizationEvaluator.CanOptimizeConstants(tree));
 
-      double r2 = Evaluate(problemData, tree, OptimizeConstants);
+      double r2 = Evaluate(problemData, tree, optimizeConstants);
       double bestR2 = results.ContainsKey(BestTrainingQualityResultName) ? GetValue<double>(results[BestTrainingQualityResultName].Value) : 0.0;
       if (r2 < bestR2)
@@ -90 +89 @@
         results.AddOrUpdateResult(BestComplexityResultName, new IntValue(complexity));
         algorithm.BestTrainingSentence = symbolString;
+
+        // record best sentence quality & length
+        DataTable dt;
+        if (!results.ContainsKey(BestSolutions)) {
+          var names = new[] { "Quality", "Relative Length", "Complexity", "Timestamp" };
+          dt = new DataTable();
+          foreach (var name in names) {
+            dt.Rows.Add(new DataRow(name) { VisualProperties = { StartIndexZero = true } });
+          }
+          results.AddOrUpdateResult(BestSolutions, dt);
+        }
+        dt = (DataTable)results[BestSolutions].Value;
+        dt.Rows["Quality"].Values.Add(r2);
+        dt.Rows["Relative Length"].Values.Add((double)symbolString.Count() / algorithm.MaxSentenceLength);
+        dt.Rows["Complexity"].Values.Add(complexity);
+        dt.Rows["Timestamp"].Values.Add(algorithm.ExecutionTime.TotalMilliseconds / 1000d);
       }
     }