Changeset 15987 for branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration

Timestamp:

07/05/18 17:52:31 (6 years ago)

Author:

bburlacu

Message:

#2886: Make sure to clear search data structures before returning in GrammarEnumerationAlgorithm.OnStopped()

File:

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

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

@@ -374 +374 @@
           } else if (!OpenPhrases.Contains(phraseHash) && !ArchivedPhrases.Contains(phraseHash)) {
 
-            double r2 = GetR2(newPhrase, fetchedSearchNode.R2);
+            bool isCompleteSentence = IsCompleteSentence(newPhrase);
+            double r2 = isCompleteSentence ? Grammar.EvaluatePhrase(newPhrase, Problem.ProblemData, OptimizeConstants) : fetchedSearchNode.R2;
             double phrasePriority = GetPriority(newPhrase, r2, maxSentenceLength, errorWeight, variableImportanceWeight);
 
@@ -396 +397 @@
       double relLength = (double)phrase.Count() / maxSentenceLength;
       double error = 1.0 - r2;
-
-      return relLength + errorWeight * error + variableImportanceWeight * phraseVariableImportance;
-    }
-
-    private double GetR2(SymbolString phrase, double parentR2) {
-      int length = phrase.Count();
-
-      // If the only nonterminal symbol is Expr, we can need to evaluate the sentence. Otherwise
-      // the phrase has the same r2 as its parent, from which it was derived.
-      for (int i = 0; i < length; i++) {
-        if (phrase[i] is NonterminalSymbol && phrase[i] != Grammar.Expr) {
-          return parentR2;
-        }
-      }
-
-      return Grammar.EvaluatePhrase(phrase, Problem.ProblemData, OptimizeConstants);
+      return error * relLength;
+    }
+
+    private bool IsCompleteSentence(SymbolString phrase) {
+      return !phrase.Any(x => x is NonterminalSymbol && x != Grammar.Expr);
     }
 
@@ -461 +451 @@
     protected override void OnStopped() {
       previousExecutionState = this.ExecutionState;
-
-      if (BestTrainingSentence == null) {
-        base.OnStopped();
-        return;
-      }
-
       // free memory at the end of the run (this saves a lot of memory)
       ArchivedPhrases.Clear();
       OpenPhrases.Clear();
       DistinctSentencesComplexity.Clear();
+
+      if (BestTrainingSentence == null) {
+        base.OnStopped();
+        return;
+      }
 
       var tree = Grammar.ParseSymbolicExpressionTree(BestTrainingSentence);