Changeset 36296 for trunk/psLib

Timestamp:

Nov 22, 2013, 1:52:43 PM (13 years ago)

Author:

watersc1

Message:

Fixed issue in scaled polyfit code that broke PATTERN.ROW correction. Briefly, these don't need to be scaled, and had median set to 0.0 and sigma set to 1.0. However, pow(median,1) was returning inf instead of the expected 0.0. I'm manually catching this case now, and simply skipping the unscaling where this issue came up.

File:

• trunk/psLib/src/math/psMinimizePolyFit.c (modified) (4 diffs)

trunk/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 *));
-        psF64 *ZcoeffErr = psAlloc((1 + poly->nX) * sizeof(psF64 *));
+        psF64 *Zcoeff = psAlloc((1 + poly->nX) * sizeof(psF64));
+        psF64 *ZcoeffErr = psAlloc((1 + poly->nX) * sizeof(psF64));
         
         for (psS32 i = 0; i <= poly->nX; i++) {
@@ -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)
                    );