Changeset 15907 for branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/GrammarEnumerationAlgorithm.cs

Timestamp:

04/16/18 15:19:58 (6 years ago)

Author:

lkammere

Message:

#2886: Changes in search heuristic for solving Poly-10 problem. Adapt tree evaluation to cover non-terminal symbols.

File:

• branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/GrammarEnumerationAlgorithm.cs (modified) (2 diffs)

branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/GrammarEnumerationAlgorithm.cs

@@ -186 +186 @@
 
               // Is the best solution found? (only if RSquaredEvaluator is activated)
-              if (Results.ContainsKey(RSquaredEvaluator.BestTrainingQualityResultName) && ((DoubleValue)Results[RSquaredEvaluator.BestTrainingQualityResultName].Value).Value == 1.0) {
-                UpdateView(force: true);
-                return;
+              if (Results.ContainsKey(RSquaredEvaluator.BestTrainingQualityResultName)) {
+                double r2 = ((DoubleValue)Results[RSquaredEvaluator.BestTrainingQualityResultName].Value).Value;
+                if (r2.IsAlmost(1.0)) {
+                  UpdateView(force: true);
+                  return;
+                }
               }
 
@@ -210 +213 @@
 
     protected double GetPriority(SymbolString phrase) {
-      return 1.0 - Grammar.EvaluatePhrase(phrase, Problem.ProblemData, OptimizeConstants);
+      double complexity = (double)Grammar.GetComplexity(phrase);
+
+      double length = phrase.Count();
+      double relLength = (length - 2) / (MaxComplexity * 7);
+      double r2 = Grammar.EvaluatePhrase(phrase, Problem.ProblemData, OptimizeConstants);
+      double error = 1.0 - r2;
+
+      double variables = 0;
+      for (int i = 0; i < phrase.Count(); i++) {
+        if (phrase[i] is VariableTerminalSymbol) variables++;
+      }
+
+      double variableRatio = 1.0 - variables / complexity;
+
+      return 1.5*relLength + error;
     }