Changeset 15994 for branches

Timestamp:

07/11/18 16:43:41 (7 years ago)

Author:

bburlacu

Message:

#2886: Add symbolic regression solution to results during algorithm run and scale model.

Location:

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

Files:

• Analysis/RSquaredEvaluator.cs (modified) (1 diff)
• GrammarEnumeration/GrammarEnumerationAlgorithm.cs (modified) (1 diff)

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

@@ -86 +86 @@
 
       if (algorithm.BestTrainingSentence == null || r2 > bestR2 || (r2.IsAlmost(bestR2) && complexity < bestComplexity)) {
-        results.AddOrUpdateResult(BestTrainingQualityResultName, new DoubleValue(r2));
+        algorithm.BestTrainingSentence = symbolString;
+
+        var model = new SymbolicRegressionModel(problemData.TargetVariable, tree, expressionTreeLinearInterpreter);
+        model.Scale(problemData);
+        var bestSolution = model.CreateRegressionSolution(problemData);
+
+        results.AddOrUpdateResult(BestTrainingQualityResultName, new DoubleValue(bestSolution.TrainingRSquared));
+        results.AddOrUpdateResult(BestTestQualityResultName, new DoubleValue(bestSolution.TestRSquared));
+        results.AddOrUpdateResult(BestTrainingModelResultName, bestSolution.Model);
+        results.AddOrUpdateResult(BestTrainingSolutionResultName, bestSolution);
         results.AddOrUpdateResult(BestComplexityResultName, new IntValue(complexity));
-        algorithm.BestTrainingSentence = symbolString;
 
         // record best sentence quality & length

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

@@ -390 +390 @@
         updateConstantsInTree: true);
 
+      model.Scale(Problem.ProblemData);
       var bestTrainingSolution = new SymbolicRegressionSolution(model, Problem.ProblemData);
+
       Results.AddOrUpdateResult(BestTrainingModelResultName, model);
       Results.AddOrUpdateResult(BestTrainingSolutionResultName, bestTrainingSolution);