Changeset 14116 for stable/HeuristicLab.Algorithms.DataAnalysis

Timestamp:

07/19/16 16:52:14 (9 years ago)

Author:

mkommend

Message:

#2627: Merged r14024, r14026, r14036, r14109 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis/3.4/NonlinearRegression (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/NonlinearRegression)
• HeuristicLab.Algorithms.DataAnalysis/3.4/NonlinearRegression/NonlinearRegression.cs (modified) (2 diffs)

stable/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

@@ -282 +282 @@
     <Compile Include="NeuralNetwork\NeuralNetworkRegression.cs" />
     <Compile Include="NeuralNetwork\NeuralNetworkRegressionSolution.cs" />
+    <Compile Include="NonlinearRegression\NonlinearRegression.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

stable/HeuristicLab.Algorithms.DataAnalysis/3.4/NonlinearRegression/NonlinearRegression.cs

@@ -42 +42 @@
   [StorableClass]
   public sealed class NonlinearRegression : FixedDataAnalysisAlgorithm<IRegressionProblem> {
-    private const string LinearRegressionModelResultName = "Regression solution";
+    private const string RegressionSolutionResultName = "Regression solution";
     private const string ModelStructureParameterName = "Model structure";
     private const string IterationsParameterName = "Iterations";
@@ -85 +85 @@
     protected override void Run() {
       var solution = CreateRegressionSolution(Problem.ProblemData, ModelStructure, Iterations);
-      Results.Add(new Result(LinearRegressionModelResultName, "The nonlinear regression solution.", solution));
+      Results.Add(new Result(RegressionSolutionResultName, "The nonlinear regression solution.", solution));
       Results.Add(new Result("Root mean square error (train)", "The root of the mean of squared errors of the regression solution on the training set.", new DoubleValue(solution.TrainingRootMeanSquaredError)));
       Results.Add(new Result("Root mean square error (test)", "The root of the mean of squared errors of the regression solution on the test set.", new DoubleValue(solution.TestRootMeanSquaredError)));