Changeset 12607 for trunk/psLib/test/math/tap_psSparse.c

Timestamp:

Mar 27, 2007, 12:52:03 PM (19 years ago)

Author:

jhoblitt

Message:

s/is_float/is_float/g
s/is_float_tol/is_float_tol/g
s/is_double/is_double/g
s/is_double_tol/is_double_tol/g
s/is_str/is_str/g
s/is_strn/is_strn/g

File:

• trunk/psLib/test/math/tap_psSparse.c (modified) (7 diffs)

trunk/psLib/test/math/tap_psSparse.c

@@ -74 +74 @@
         dS2 = sqrt (dS2/100.0 - dS*dS);
 
-        ok_float_tol (dS2, 0.0, 1e-4, "scatter: %.20f", dS2);
+        is_float_tol (dS2, 0.0, 1e-4, "scatter: %.20f", dS2);
 
         psFree (matrix);
@@ -147 +147 @@
         dS2 = sqrt (dS2/100.0 - dS*dS);
 
-        ok_float_tol (dS2, 0.0, 1e-4, "scatter: %.20f", dS2);
+        is_float_tol (dS2, 0.0, 1e-4, "scatter: %.20f", dS2);
 
         psFree (matrix);
@@ -219 +219 @@
         // test the support functions: LowerProduct
         fVec = psSparseBorderLowerProduct (NULL, border, xRef);
-        ok_float (fVec->n, 1.0, "f dimen: %d", fVec->n);
-        ok_float (fVec->data.F32[0], 0.3, "f(0): %f", fVec->data.F32[0]);
+        is_float (fVec->n, 1.0, "f dimen: %d", fVec->n);
+        is_float (fVec->data.F32[0], 0.3, "f(0): %f", fVec->data.F32[0]);
         psFree (fVec);
 
         // test the support functions: Upper Product
         fVec = psSparseBorderUpperProduct (NULL, border, yRef);
-        ok_float (fVec->n, 2.0, "f dimen: %d", fVec->n);
-        ok_float (fVec->data.F32[0], 0.05, "f(0): %f", fVec->data.F32[0]);
-        ok_float (fVec->data.F32[1], 0.10, "f(0): %f", fVec->data.F32[1]);
+        is_float (fVec->n, 2.0, "f dimen: %d", fVec->n);
+        is_float (fVec->data.F32[0], 0.05, "f(0): %f", fVec->data.F32[0]);
+        is_float (fVec->data.F32[1], 0.10, "f(0): %f", fVec->data.F32[1]);
         psFree (fVec);
 
         // test the support functions: Square Product
         fVec = psSparseBorderSquareProduct (NULL, border, yRef);
-        ok_float (fVec->n, 1.0, "f dimen: %d", fVec->n);
-        ok_float (fVec->data.F32[0], 0.25, "f(0): %f", fVec->data.F32[0]);
+        is_float (fVec->n, 1.0, "f dimen: %d", fVec->n);
+        is_float (fVec->data.F32[0], 0.25, "f(0): %f", fVec->data.F32[0]);
         psFree (fVec);
 
@@ -239 +239 @@
         psVector *gVec = NULL;
         psSparseBorderMultiply (&fVec, &gVec, border, xRef, yRef);
-        ok_float (fVec->data.F32[0], 1.15, "f(0): %f", fVec->data.F32[0]);
-        ok_float (fVec->data.F32[1], 1.20, "f(1): %f", fVec->data.F32[1]);
-        ok_float (gVec->data.F32[0], 0.55, "g(0): %f", gVec->data.F32[0]);
+        is_float (fVec->data.F32[0], 1.15, "f(0): %f", fVec->data.F32[0]);
+        is_float (fVec->data.F32[1], 1.20, "f(1): %f", fVec->data.F32[1]);
+        is_float (gVec->data.F32[0], 0.55, "g(0): %f", gVec->data.F32[0]);
 
         // supply the fVec and gVec data to the border
@@ -263 +263 @@
         psVector *yFit = NULL;
         psSparseBorderSolve (&xFit, &yFit, constraint, border, 4);
-        ok_float_tol (xFit->data.F32[0], 1.0, 1e-4, "f(0): %f", xFit->data.F32[0]);
-        ok_float_tol (xFit->data.F32[1], 1.0, 1e-4, "f(1): %f", xFit->data.F32[1]);
-        ok_float_tol (yFit->data.F32[0], 0.5, 1e-4, "g(0): %f", yFit->data.F32[0]);
+        is_float_tol (xFit->data.F32[0], 1.0, 1e-4, "f(0): %f", xFit->data.F32[0]);
+        is_float_tol (xFit->data.F32[1], 1.0, 1e-4, "f(1): %f", xFit->data.F32[1]);
+        is_float_tol (yFit->data.F32[0], 0.5, 1e-4, "g(0): %f", yFit->data.F32[0]);
 
         psFree (xFit);
@@ -321 +321 @@
             }
         }
-        ok_float(border->Bij->data.F32[0][0], 0.1, "set matrix element %d,%d", 0, 0);
+        is_float(border->Bij->data.F32[0][0], 0.1, "set matrix element %d,%d", 0, 0);
 
         // construct the Q component:
@@ -381 +381 @@
         dS /= Nrows;
         dS2 = sqrt (dS2/Nrows - dS*dS);
-        ok_float_tol (dS2, 0.0, 1e-4, "scatter: %.20f", dS2);
+        is_float_tol (dS2, 0.0, 1e-4, "scatter: %.20f", dS2);
 
         // measure stdev between yFit and yRef
         float dY = yRef->data.F32[0] - yFit->data.F32[0];
         // fprintf (stderr, "%5.3f %5.3f %5.3f %5.3f\n", gVec->data.F32[0], yRef->data.F32[0], yFit->data.F32[0], dS);
-        ok_float_tol (dY, 0.0, 2e-4, "scatter: %.20f", dY);
+        is_float_tol (dY, 0.0, 2e-4, "scatter: %.20f", dY);
 
         psFree (xRef);