Changeset 18006 for branches/3087_Ceres_Integration/HeuristicLab.Analysis/3.3/Statistics

Timestamp:

07/13/21 10:55:09 (3 years ago)

Author:

gkronber

Message:

#3087: merged r17784:18004 from trunk to branch to prepare for trunk reintegration (fixed a conflict in CrossValidation.cs)

Location:

branches/3087_Ceres_Integration

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis (modified) (1 prop)
• HeuristicLab.Analysis/3.3/Statistics/Fitting/ExpFitting.cs (modified) (2 diffs)
• HeuristicLab.Analysis/3.3/Statistics/Fitting/LogFitting.cs (modified) (2 diffs)

branches/3087_Ceres_Integration/HeuristicLab.Analysis/3.3/Statistics/Fitting/ExpFitting.cs

@@ -41 +41 @@
     public void Calculate(double[] y, double[] x, out double p0) {
       if (y.Count() != x.Count()) {
-        throw new ArgumentException("The lenght of x and y needs do be equal. ");
+        throw new ArgumentException("The length of x and y needs do be equal. ");
       }
 
       double[] c = new double[] { 0.3 };
-      double epsf = 0;
       double epsx = 0.000001;
       int maxits = 0;
@@ -59 +58 @@
 
       alglib.lsfitcreatef(xx, y, c, diffstep, out state);
-      alglib.lsfitsetcond(state, epsf, epsx, maxits);
+      alglib.lsfitsetcond(state, epsx, maxits);
       alglib.lsfitfit(state, ExpFunc, null, null);
       alglib.lsfitresults(state, out info, out c, out rep);

branches/3087_Ceres_Integration/HeuristicLab.Analysis/3.3/Statistics/Fitting/LogFitting.cs

@@ -45 +45 @@
 
       double[] c = new double[] { 0.3, 0.3 };
-      double epsf = 0;
       double epsx = 0.000001;
       int maxits = 0;
@@ -59 +58 @@
 
       alglib.lsfitcreatef(xx, y, c, diffstep, out state);
-      alglib.lsfitsetcond(state, epsf, epsx, maxits);
+      alglib.lsfitsetcond(state, epsx, maxits);
       alglib.lsfitfit(state, LogFunc, null, null);
       alglib.lsfitresults(state, out info, out c, out rep);