Changeset 36345 for branches/eam_branches/ipp-20130904/psLib/src/math/psMinimizePolyFit.c

Timestamp:

Dec 4, 2013, 2:11:09 PM (13 years ago)

Author:

bills

Message:

Integrate updated psStats code from the trunk

File:

• branches/eam_branches/ipp-20130904/psLib/src/math/psMinimizePolyFit.c (modified) (4 diffs, 1 prop)

branches/eam_branches/ipp-20130904/psLib/src/math/psMinimizePolyFit.c

@@ -715 +715 @@
         sigma  = (sorted->data.F64[3 * sorted->n / 4] - sorted->data.F64[sorted->n / 4]); 
         psFree(sorted);
+
+        if ((!isfinite(median))||
+            (!isfinite(sigma))) {
+          median = 0.0;
+          sigma = 1.0;
+        }
+        if ((median == 0.0)&&(sigma == 1.0)) {
+          scale = false;
+        }
         // I can't see a way to not clobber x if it's already F64, so make a copy.x
         z64 = psVectorCopy(NULL,x64,PS_TYPE_F64);
@@ -726 +735 @@
         
         result = VectorFitPolynomial1DOrd(poly, mask, maskValue, f64, fErr64, z64);
+        psFree(z64); // Done with this.
       }
       else {
@@ -736 +746 @@
       
       if (scale) {
-        psFree(z64); // Done with this.
-
         // Undo scaling in the polynomial values.
         psF64 *Zcoeff = psAlloc((1 + poly->nX) * sizeof(psF64));
@@ -757 +765 @@
 #if (CZW)
             printf("        %d %d %f %f %f %f => %f\n",
-                   i,j,Zcoeff[j],pow(1.0 / sigma,j) * pow(-1,j - i),pow(median,j - i),1.0 * psBinomialCoeff(j,i),
+                   i,j,Zcoeff[j],
+                   pow(1.0 / sigma,j) * pow(-1,j - i),
+                   pow(median,j - i),
+                   1.0 * psBinomialCoeff(j,i),
                    Zcoeff[j] * pow(1.0 / sigma,j) * pow(-1,j  -i) * pow(median,j - i) * 1.0 * psBinomialCoeff(j,i)
                    );