Changeset 18183 for branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/NMSESingleObjectiveConstraintsEvaluator.cs

Timestamp:

01/11/22 11:09:29 (2 years ago)

Author:

mkommend

Message:

#3136: Fixed bug in paramter optimization code of NMSE evaluator (tree has never been updated).

File:

• branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/NMSESingleObjectiveConstraintsEvaluator.cs (modified) (4 diffs)

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/NMSESingleObjectiveConstraintsEvaluator.cs

@@ -254 +254 @@
           lowerEstimationLimit,
           upperEstimationLimit);
-
       else if (applyLinearScaling) // extra scaling terms, which are included in tree
         CalcLinearScalingTerms(tree, problemData, rows, interpreter);
@@ -342 +341 @@
       counter.GradientEvaluations += rowEvaluationsCounter.GradientEvaluations / n;
 
-      // * TerminationType, completetion code:
+      // * TerminationType, completion code:
       //     * -8    optimizer detected NAN/INF values either in the function itself,
       //             or in its Jacobian
@@ -356 +355 @@
       //             X contains point which was "current accepted" when termination
       //             request was submitted.
-      if (rep.terminationtype < 0) {
+      if (rep.terminationtype > 0) {
         UpdateParameters(tree, c, updateVariableWeights);
       }
@@ -399 +398 @@
       return (double[] c, double[] resid, object o) => {
         for (int i = 0; i < y.Length; i++) {
-          Buffer.BlockCopy(x, i * d * sizeof(double), xi, 0, d*sizeof(double)); // copy row. We are using BlockCopy instead of Array.Copy because x has rank 2
+          Buffer.BlockCopy(x, i * d * sizeof(double), xi, 0, d * sizeof(double)); // copy row. We are using BlockCopy instead of Array.Copy because x has rank 2
           resid[i] = func(c, xi) - y[i];
         }