Changeset 14316 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis

Timestamp:

09/29/16 17:16:44 (8 years ago)

Author:

mkommend

Message:

#2657: Changed nonlinear regression to perform at least one optimization.

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/NonlinearRegression/NonlinearRegression.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/NonlinearRegression/NonlinearRegression.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
@@ -130 +128 @@
       if (SetSeedRandomly) Seed = (new System.Random()).Next();
       var rand = new MersenneTwister((uint)Seed);
-      IRegressionSolution bestSolution = null;
+
+      var bestSolution = CreateRegressionSolution(Problem.ProblemData, ModelStructure, Iterations, rand);
       for (int r = 0; r < Restarts; r++) {
         var solution = CreateRegressionSolution(Problem.ProblemData, ModelStructure, Iterations, rand);
-        if (bestSolution == null || solution.TrainingRootMeanSquaredError < bestSolution.TrainingRootMeanSquaredError) {
+        if (solution.TrainingRootMeanSquaredError < bestSolution.TrainingRootMeanSquaredError) {
           bestSolution = solution;
         }
@@ -149 +148 @@
     /// The starting point for the numeric constants is initialized randomly if a random number generator is specified (~N(0,1)). Otherwise the user specified constants are
     /// used as a starting point. 
-    /// </summary>
+    /// </summary>-
     /// <param name="problemData">Training and test data</param>
     /// <param name="modelStructure">The function as infix expression</param>