Changeset 24083

Timestamp:

May 6, 2009, 2:17:40 PM (17 years ago)

Author:

eugene

Message:

reinstate tests with segfaults to remind us to fix them; modify psMatrixLUSolve api names

File:

• trunk/psLib/test/math/tap_psMatrix03.c (modified) (5 diffs)

trunk/psLib/test/math/tap_psMatrix03.c

@@ -106 +106 @@
         psVector *inVector = (psVector*) psVectorAlloc(3, PS_TYPE_F64);
 
-        luImage = psMatrixLUD(luImage, &perm, inImage);
-        ok(luImage != NULL, "psMatrixLUD() produced a non-NULL LU matrix");
+        luImage = psMatrixLUDecomposition(luImage, &perm, inImage);
+        ok(luImage != NULL, "psMatrixLUDecomposition() produced a non-NULL LU matrix");
         skip_start(luImage == NULL, 6, "Skipping tests because LU matrix was NULL");
-        ok(!checkMatrix(luImage), "psMatrixLUD() produced the correct LU matrix");
+        ok(!checkMatrix(luImage), "psMatrixLUDecomposition() produced the correct LU matrix");
         ok(luImage->type.dimen == PS_DIMEN_IMAGE, "The LU matrix has the correct ->dimen member");
         ok(luImage == tempImage, "The LU matrix was not created from scratch");
@@ -119 +119 @@
         inVector->n = 3;
 
-        outVector = psMatrixLUSolve(outVector, luImage, inVector, perm);
-        ok(!checkVector(outVector), "psMatrixLUSolve() correctly solved the equations");
+        outVector = psMatrixLUSolution(outVector, luImage, inVector, perm);
+        ok(!checkVector(outVector), "psMatrixLUSolution() correctly solved the equations");
         ok(outVector->type.dimen == PS_DIMEN_VECTOR, "The output vector hasthe correct ->dimen member");
         ok(outVector == tempVector, "The output vector was not created from scratch");
@@ -159 +159 @@
         inVector32->n = 3;
 
-        luImage32 = psMatrixLUD(luImage32, &perm32, inImage32);
-        ok(luImage32 != NULL, "psMatrixLUD() produced a non-NULL LU matrix");
+        luImage32 = psMatrixLUDecomposition(luImage32, &perm32, inImage32);
+        ok(luImage32 != NULL, "psMatrixLUDecomposition() produced a non-NULL LU matrix");
         skip_start(luImage32 == NULL, 6, "Skipping tests because LU matrix was NULL");
-        ok(!checkMatrix(luImage32), "psMatrixLUD() produced the correct LU matrix");
+        ok(!checkMatrix(luImage32), "psMatrixLUDecomposition() produced the correct LU matrix");
         ok(luImage32->type.dimen == PS_DIMEN_IMAGE, "The LU matrix has the correct ->dimen member");
         ok(luImage32 == tempImage32, "The LU matrix was not created from scratch");
@@ -168 +168 @@
         // Determine solution to matrix equation
 
-        outVector32 = psMatrixLUSolve(outVector32, luImage32, inVector32, perm32);
-        ok(!checkVector(outVector32), "psMatrixLUSolve() correctly solved the equations");
+        outVector32 = psMatrixLUSolution(outVector32, luImage32, inVector32, perm32);
+        ok(!checkVector(outVector32), "psMatrixLUSolution() correctly solved the equations");
         ok(outVector32->type.dimen == PS_DIMEN_VECTOR, "The output vector hasthe correct ->dimen member");
         ok(outVector32 == tempVector32, "The output vector was not created from scratch");
@@ -182 +182 @@
     }
 
-
     // Attempt to use null image input argument
     // XXX: This test should generate an error or warning
     // XXX: This seg-faults
-    if (0) {
-        psMemId id = psMemGetId();
-        psImage *imageTest = (psImage*)psImageAlloc(3, 3, PS_TYPE_F64);
-        psMatrixLUD(imageTest, NULL, NULL);
-        psFree(imageTest);
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
-    }
-
+    { 
+        psMemId id = psMemGetId();
+        psImage *imageTest = (psImage*)psImageAlloc(3, 3, PS_TYPE_F64);
+        psMatrixLUDecomposition(imageTest, NULL, NULL);
+        psFree(imageTest);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
 
     // Attempt to use null input vector argument
     // XXX: This test should generate an error or warning
     // XXX: This seg-faulta
-    if (0) {
-        psMemId id = psMemGetId();
-        psVector *vectorBad = NULL;
-        psVector *vectorBadOut = (psVector*)psVectorAlloc(3, PS_TYPE_F64);
-        psVector *permBad = (psVector*)psVectorAlloc(3, PS_TYPE_F64);
-        psImage *imageTest = (psImage*)psImageAlloc(3, 3, PS_TYPE_F64);
-        psMatrixLUSolve(vectorBadOut, imageTest, vectorBad, permBad);
-        psFree(vectorBadOut);
-        psFree(permBad);
-        psFree(imageTest);
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
-    }
-
+    { 
+        psMemId id = psMemGetId();
+        psVector *vectorBad = NULL;
+        psVector *vectorBadOut = (psVector*)psVectorAlloc(3, PS_TYPE_F64);
+        psVector *permBad = (psVector*)psVectorAlloc(3, PS_TYPE_F64);
+        psImage *imageTest = (psImage*)psImageAlloc(3, 3, PS_TYPE_F64);
+        psMatrixLUSolution(vectorBadOut, imageTest, vectorBad, permBad);
+        psFree(vectorBadOut);
+        psFree(permBad);
+        psFree(imageTest);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
 
     // Attempt to use null LU image argument
     // XXX: This test should generate an error or warning, but we don't know how to test that.
     // XXX: This seg-faulta
-    if (0) {
-        psMemId id = psMemGetId();
-        psVector *vectorBadOut = (psVector*)psVectorAlloc(3, PS_TYPE_F64);
-        psVector *vectorBad = (psVector*)psVectorAlloc(3, PS_TYPE_F64);
-        psVector *permBad = (psVector*)psVectorAlloc(3, PS_TYPE_F64);
-        psMatrixLUSolve(vectorBadOut, NULL, vectorBad, permBad);
-        psFree(vectorBadOut);
-        psFree(vectorBad);
-        psFree(permBad);
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    {
+        psMemId id = psMemGetId();
+        psVector *vectorBadOut = (psVector*)psVectorAlloc(3, PS_TYPE_F64);
+        psVector *vectorBad = (psVector*)psVectorAlloc(3, PS_TYPE_F64);
+        psVector *permBad = (psVector*)psVectorAlloc(3, PS_TYPE_F64);
+        psMatrixLUSolution(vectorBadOut, NULL, vectorBad, permBad);
+        psFree(vectorBadOut);
+        psFree(vectorBad);
+        psFree(permBad);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
 }