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

Timestamp:

May 1, 2007, 6:14:33 PM (19 years ago)

Author:

gusciora

Message:

Added tabular file of all psLib functions in Chapter 6 of the SDRS (Data
Manipulation). Most of the test file changes in this check-in are fairly
cosmetic.

File:

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

trunk/psLib/test/math/tap_psSparse.c

@@ -10 +10 @@
     plan_tests(26);
 
-//    diag("psSparse() tests");
-
     // test psSparseSolve for a simple normal example matrix
     {
         psMemId id = psMemGetId();
 
-//        diag ("solve a normalized matrix equation with psSparseSolve");
+        //solve a normalized matrix equation with psSparseSolve
 
         // the basic equation is Ax = b
@@ -28 +26 @@
         skip_start(matrix == NULL, 5, "Skipping tests because psSparseAlloc() failed");
 
-        for (int i = 0; i < 100; i++)
-        {
+        for (int i = 0; i < 100; i++) {
             psSparseMatrixElement (matrix, i, i, 1.0);
             if (i + 1 < 100) {
@@ -38 +35 @@
         // incoming matrix elements do not need to be in order; sort before
         // applying sparse matrix
-        psSparseResort (matrix);
+        psSparseResort(matrix);
 
         psVector *xRef = psVectorAlloc (100, PS_TYPE_F32);
@@ -46 +43 @@
         }
 
-        psVector *bVec = psSparseMatrixTimesVector (NULL, matrix, xRef);
-
-        for (int i = 0; i < 100; i++)
-        {
-            psSparseVectorElement (matrix, i, bVec->data.F32[i]);
+        psVector *bVec = psSparseMatrixTimesVector(NULL, matrix, xRef);
+
+        for (int i = 0; i < 100; i++) {
+            psSparseVectorElement(matrix, i, bVec->data.F32[i]);
         }
 
@@ -59 +55 @@
 
         // solve for normalization terms (need include local sky?)
-        psVector *xFit = psSparseSolve (NULL, constraint, matrix, 4);
+        psVector *xFit = psSparseSolve(NULL, constraint, matrix, 4);
 
         // measure stdev between xFit and xRes
@@ -89 +85 @@
         psMemId id = psMemGetId();
 
-//        diag ("solve a non-normalized matrix equation with psSparseSolve");
-
+        //solve a non-normalized matrix equation with psSparseSolve
         // the basic equation is Ax = b
-
         // create a matrix A with diagonals of 1 and a small number of off diagonal elements.
         // construct a vector x, construct the corresponding vector b by multiplication. solve
@@ -101 +95 @@
         skip_start(matrix == NULL, 5, "Skipping tests because psSparseAlloc() failed");
 
-        for (int i = 0; i < 100; i++)
-        {
+        for (int i = 0; i < 100; i++) {
             psSparseMatrixElement (matrix, i, i, 5.0);
             if (i + 1 < 100) {
@@ -111 +104 @@
         // incoming matrix elements do not need to be in order; sort before
         // applying sparse matrix
-        psSparseResort (matrix);
+        psSparseResort(matrix);
 
         psVector *xRef = psVectorAlloc (100, PS_TYPE_F32);
@@ -119 +112 @@
         }
 
-        psVector *bVec = psSparseMatrixTimesVector (NULL, matrix, xRef);
-
-        for (int i = 0; i < 100; i++)
-        {
-            psSparseVectorElement (matrix, i, bVec->data.F32[i]);
+        psVector *bVec = psSparseMatrixTimesVector(NULL, matrix, xRef);
+
+        for (int i = 0; i < 100; i++) {
+            psSparseVectorElement(matrix, i, bVec->data.F32[i]);
         }
 
@@ -132 +124 @@
 
         // solve for normalization terms (need include local sky?)
-        psVector *xFit = psSparseSolve (NULL, constraint, matrix, 4);
+        psVector *xFit = psSparseSolve(NULL, constraint, matrix, 4);
 
         // measure stdev between xFit and xRes
@@ -173 +165 @@
         psMemId id = psMemGetId();
 
-//        diag ("solve a simple, small matrix equation ");
+        //solve a simple, small matrix equation
 
         // the basic equation (Ax = b) is:
@@ -192 +184 @@
         skip_start(matrix == NULL, 5, "Skipping tests because psSparseAlloc() failed");
 
-        psSparseMatrixElement (matrix, 0, 0, 1.0);
-        psSparseMatrixElement (matrix, 1, 1, 1.0);
-        psSparseMatrixElement (matrix, 1, 0, 0.1);
-        psSparseResort (matrix);
+        psSparseMatrixElement(matrix, 0, 0, 1.0);
+        psSparseMatrixElement(matrix, 1, 1, 1.0);
+        psSparseMatrixElement(matrix, 1, 0, 0.1);
+        psSparseResort(matrix);
 
         // border region has a width of 1:
@@ -244 +236 @@
 
         // supply the fVec and gVec data to the border
-        for (int i = 0; i < Nrows; i++)
-        {
-            psSparseVectorElement (border->sparse, i, fVec->data.F32[i]);
-        }
-        for (int i = 0; i < Nborder; i++)
-        {
-            psSparseBorderElementG (border, i, gVec->data.F32[i]);
+        for (int i = 0; i < Nrows; i++) {
+            psSparseVectorElement(border->sparse, i, fVec->data.F32[i]);
+        }
+        for (int i = 0; i < Nborder; i++) {
+            psSparseBorderElementG(border, i, gVec->data.F32[i]);
         }
 
@@ -262 +252 @@
         psVector *xFit = NULL;
         psVector *yFit = NULL;
-        psSparseBorderSolve (&xFit, &yFit, constraint, border, 4);
+        psSparseBorderSolve(&xFit, &yFit, constraint, border, 4);
         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]);
@@ -283 +273 @@
         psMemId id = psMemGetId();
 
-//        diag ("solve a simple, small matrix equation ");
+        // solve a simple, small matrix equation
 
         // the basic equation (Ax = b) is:
@@ -302 +292 @@
         skip_start(matrix == NULL, 5, "Skipping tests because psSparseAlloc() failed");
 
-        for (int i = 0; i < Nrows; i++)
-        {
-            psSparseMatrixElement (matrix, i, i, 1.0);
+        for (int i = 0; i < Nrows; i++) {
+            psSparseMatrixElement(matrix, i, i, 1.0);
             if (i + 1 < Nrows) {
-                psSparseMatrixElement (matrix, i + 1, i, 0.1);
-            }
-        }
-        psSparseResort (matrix);
+                psSparseMatrixElement(matrix, i + 1, i, 0.1);
+            }
+        }
+        psSparseResort(matrix);
 
         // border region has a width of 1:
@@ -349 +338 @@
 
         // supply the fVec and gVec data to the border
-        for (int i = 0; i < Nrows; i++)
-        {
-            psSparseVectorElement (border->sparse, i, fVec->data.F32[i]);
-        }
-        for (int i = 0; i < Nborder; i++)
-        {
-            psSparseBorderElementG (border, i, gVec->data.F32[i]);
+        for (int i = 0; i < Nrows; i++) {
+            psSparseVectorElement(border->sparse, i, fVec->data.F32[i]);
+        }
+        for (int i = 0; i < Nborder; i++) {
+            psSparseBorderElementG(border, i, gVec->data.F32[i]);
         }
 
@@ -367 +354 @@
         psVector *xFit = NULL;
         psVector *yFit = NULL;
-        psSparseBorderSolve (&xFit, &yFit, constraint, border, 4);
+        psSparseBorderSolve(&xFit, &yFit, constraint, border, 4);
 
         // measure stdev between xFit and xRef