Changeset 25027 for branches/pap/psLib/src/math/psPolynomialMD.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• psLib/src/math/psPolynomialMD.c (modified) (4 diffs)

branches/pap/psLib/src/math/psPolynomialMD.c

@@ -304 +304 @@
     polynomialMDFill(poly->fitMatrix);
 
-    poly->LU = psMatrixLUD(poly->LU, &poly->LUperm, poly->fitMatrix); // LU-decomposed matrix
+    poly->LU = psMatrixLUDecomposition(poly->LU, &poly->LUperm, poly->fitMatrix); // LU-decomposed matrix
     if (!poly->LU) {
         psError(PS_ERR_UNKNOWN, false, "Unable to LU-Decompose least-squares matrix.");
@@ -310 +310 @@
     }
 
-    poly->coeff = psMatrixLUSolve(poly->coeff, poly->LU, poly->fitVector, poly->LUperm);
+    poly->coeff = psMatrixLUSolution(poly->coeff, poly->LU, poly->fitVector, poly->LUperm);
     if (!poly->coeff) {
         psError(PS_ERR_UNKNOWN, false, "Unable to solve least-squares equation.");
@@ -321 +321 @@
 }
 
-// XXX this function should take a (psVectorMaskType markVal) argument
 bool psPolynomialMDClipFit(psPolynomialMD *poly, const psVector *values, const psVector *errors,
                            const psVector *mask, psVectorMaskType maskVal, const psArray *coordsArray,
@@ -447 +446 @@
 
     // Solve least-squares equation
-    *lu = psMatrixLUD(*lu, perm, matrix);
+    *lu = psMatrixLUDecomposition(*lu, perm, matrix);
     if (!*lu) {
         psError(PS_ERR_UNKNOWN, false, "Unable to LU-Decompose least-squares matrix.");
         return false;
     }
-    poly->coeff = psMatrixLUSolve(poly->coeff, *lu, vector, *perm);
+    poly->coeff = psMatrixLUSolution(poly->coeff, *lu, vector, *perm);
     if (!poly->coeff) {
         psError(PS_ERR_UNKNOWN, false, "Unable to solve least-squares equation.");