Changeset 15985

Timestamp:

07/05/18 15:33:21 (6 years ago)

Author:

bburlacu

Message:

#2886: Simplify code in RSquaredEvaluator. Turn on linear scaling for the constant optimization evaluator.

File:

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

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

@@ -83 +83 @@
         return;
 
-      var bestComplexity = int.MaxValue;
-      if (results.ContainsKey(BestComplexityResultName)) {
-        bestComplexity = GetValue<int>(results[BestComplexityResultName].Value);
-      } else if (algorithm.BestTrainingSentence != null) {
-        bestComplexity = grammar.GetComplexity(algorithm.BestTrainingSentence);
-        results.AddOrUpdateResult(BestComplexityResultName, new IntValue(bestComplexity));
-      }
+      var bestComplexity = results.ContainsKey(BestComplexityResultName) ? GetValue<int>(results[BestComplexityResultName].Value) : int.MaxValue;
       var complexity = grammar.GetComplexity(symbolString);
 
-      if (r2 > bestR2 || (r2.IsAlmost(bestR2) && complexity < bestComplexity)) {
+      if (algorithm.BestTrainingSentence == null || r2 > bestR2 || (r2.IsAlmost(bestR2) && complexity < bestComplexity)) {
         results.AddOrUpdateResult(BestTrainingQualityResultName, new DoubleValue(r2));
         results.AddOrUpdateResult(BestComplexityResultName, new IntValue(complexity));
@@ -109 +103 @@
           problemData,
           problemData.TrainingIndices,
-          applyLinearScaling: false,
+          applyLinearScaling: true,
           maxIterations: 10,
           updateVariableWeights: false,