Changeset 11914 for trunk/sources/HeuristicLab.Analysis/3.3/Statistics/Fitting/ExpFitting.cs

Timestamp:

02/05/15 16:09:10 (9 years ago)

Author:

ascheibe

Message:

#2031 implemented review comments

Location:

trunk/sources/HeuristicLab.Analysis/3.3/Statistics/Fitting

Files:

• . (added)
• ExpFitting.cs (moved) (moved from trunk/sources/HeuristicLab.Analysis/3.3/Statistics/ExpFitting.cs) (4 diffs)

trunk/sources/HeuristicLab.Analysis/3.3/Statistics/Fitting/ExpFitting.cs

@@ -25 +25 @@
 namespace HeuristicLab.Analysis.Statistics {
   public class ExpFitting : IFitting {
-    private void LogFunc(double[] c, double[] x, ref double func, object obj) {
+    private void ExpFunc(double[] c, double[] x, ref double func, object obj) {
       func = Math.Exp(-c[0] * Math.Pow(x[0], 2));
     }
@@ -34 +34 @@
     }
 
-    public void Calculate(double[] dataPoints, out double p0, out double p1) {
+    public void Calculate(double[] dataPoints, out double p0) {
       var stdX = GetDefaultXValues(dataPoints.Count());
-      Calculate(dataPoints, stdX, out p0, out p1);
+      Calculate(dataPoints, stdX, out p0);
     }
 
-    public void Calculate(double[] y, double[] x, out double p0, out double p1) {
+    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. ");
@@ -60 +60 @@
       alglib.lsfitcreatef(xx, y, c, diffstep, out state);
       alglib.lsfitsetcond(state, epsf, epsx, maxits);
-      alglib.lsfitfit(state, LogFunc, null, null);
+      alglib.lsfitfit(state, ExpFunc, null, null);
       alglib.lsfitresults(state, out info, out c, out rep);
 
       p0 = c[0];
-      p1 = c[0];
     }
 
-    public DataRow CalculateFittedLine(double[] dataPoints, string rowName) {
-      DataRow newRow = new DataRow(rowName);
-      double c0, c1;
-      Calculate(dataPoints, out c0, out c1);
+    public DataRow CalculateFittedLine(double[] dataPoints) {
+      DataRow newRow = new DataRow();
+      double c0;
+      Calculate(dataPoints, out c0);
       var stdX = GetDefaultXValues(dataPoints.Count());
 
@@ -80 +79 @@
     }
 
-    public DataRow CalculateFittedLine(double[] y, double[] x, string rowName) {
-      DataRow newRow = new DataRow(rowName);
-      double c0, c1;
-      Calculate(y, x, out c0, out c1);
+    public DataRow CalculateFittedLine(double[] y, double[] x) {
+      DataRow newRow = new DataRow();
+      double c0;
+      Calculate(y, x, out c0);
 
       for (int i = 0; i < x.Count(); i++) {