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

Timestamp:

03/23/18 18:36:23 (7 years ago)

Author:

lkammere

Message:

#2886: Change complexity measure from number of nodes in tree to number of variable references.

Location:

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

Files:

• RSquaredEvaluator.cs (modified) (3 diffs)
• SentenceLogger.cs (modified) (1 diff)

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

@@ -77 +77 @@
         problemData.TrainingIndices,
         applyLinearScaling: false,
-        maxIterations: 200,
+        maxIterations: 50,
         updateVariableWeights: true,
         updateConstantsInTree: true);
@@ -96 +96 @@
       //var estVals = model.GetEstimatedValues(problemData.Dataset, problemData.TrainingIndices);
       //OnlineCalculatorError error;
-      //r2 = OnlinePearsonsRCalculator.Calculate(target, estVals, out error);
+      //double r2 = OnlinePearsonsRCalculator.Calculate(target, estVals, out error);
       //if (error != OnlineCalculatorError.None) r2 = 0.0;
 
@@ -102 +102 @@
       bool better = r2 > bestR2Result.Value;
       bool equallyGood = r2.IsAlmost(bestR2Result.Value);
-      bool shorter = algorithm.BestTrainingSentence != null && symbolString.Count() < algorithm.BestTrainingSentence.Count();
+      bool shorter = false;
+
+      if (!better && equallyGood) {
+        shorter = algorithm.BestTrainingSentence != null &&
+          algorithm.Grammar.GetComplexity(algorithm.BestTrainingSentence) > algorithm.Grammar.GetComplexity(symbolString);
+      }
       if (better || (equallyGood && shorter)) {
         bestR2Result.Value = r2;

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

@@ -45 +45 @@
 
     private void GrammarEnumerationAlgorithmOnStarted(object sender, EventArgs eventArgs) {
-      string datePostfix = $"_{DateTime.Now:yyyy-MM-dd_HH-mm}_TreeSize-{((GrammarEnumerationAlgorithm) sender).MaxTreeSize}.csv";
+      string datePostfix = $"_{DateTime.Now:yyyy-MM-dd_HH-mm}_TreeSize-{((GrammarEnumerationAlgorithm) sender).MaxComplexity}.csv";
       distinctSentencesFileName = workingDir + @"\distinctSentences" + datePostfix;
       allSentencesFileName = workingDir + @"\allSentences" + datePostfix;