Changeset 17851

Timestamp:

02/26/21 09:51:21 (3 years ago)

Author:

gkronber

Message:

#3106 Create solution for best individual of each generation

File:

• branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Algorithms.DataAnalysis/3.4/ContinuedFractionRegression/Problem.cs (modified) (3 diffs)

branches/3106_AnalyticContinuedFractionsRegression/HeuristicLab.Algorithms.DataAnalysis/3.4/ContinuedFractionRegression/Problem.cs

@@ -14 +14 @@
 using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Problems.DataAnalysis.Symbolic;
+using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
 using HeuristicLab.Problems.Instances;
 
@@ -417 +418 @@
       #endregion
 
-      results.AddOrUpdateResult("Model", CreateSymbolicExpressionTree(binar, coeff, TrainingTrainingDataset.VariableNames.ToArray()));
+      #region create tree and regression solution
+      var allVariables = TrainingTrainingDataset.VariableNames;
+      var allowedInputVariables = allVariables.Take(allVariables.Count() - 1);
+      var targetVariable = allVariables.Last();
+
+      var tree = CreateSymbolicExpressionTree(binar, coeff, TrainingTrainingDataset.VariableNames.ToArray());
+      var model = new SymbolicRegressionModel(targetVariable, tree, new SymbolicDataAnalysisExpressionTreeLinearInterpreter());
+      var combinedData = MatrixExtensions.VertCat(dataMatrix.CloneAsMatrix(), dataMatrixTest.CloneAsMatrix());
+      var combinedDs = new Dataset(allVariables, combinedData);
+      var problemData = new RegressionProblemData(combinedDs, allowedInputVariables, targetVariable);
+      problemData.TrainingPartition.Start = 0;
+      problemData.TrainingPartition.End = dataMatrix.Rows;
+      problemData.TestPartition.Start = dataMatrix.Rows;
+      problemData.TestPartition.End = combinedDs.Rows;
+      var sol = new SymbolicRegressionSolution(model, problemData);
+      results.AddOrUpdateResult("Solution", sol);
+      #endregion
     }
 
@@ -457 +474 @@
 
       var startNode = startSy.CreateTreeNode();
-      var progRootNode = progRootSy.CreateTreeNode();
-      startNode.AddSubtree(progRootNode);
-      progRootNode.AddSubtree(expression);
-      return new SymbolicExpressionTree(progRootNode) ;
+      var progRoot = progRootSy.CreateTreeNode();
+      progRoot.AddSubtree(startNode);
+      startNode.AddSubtree(expression);
+      return new SymbolicExpressionTree(progRoot) ;
     }