Changeset 4160 for trunk/psLib/test/dataManip/tst_psMatrix05.c

Timestamp:

Jun 8, 2005, 12:28:08 PM (21 years ago)

Author:

desonia

Message:

Bug #403 -- implemented and tested non-square matrix multiply.

File:

• trunk/psLib/test/dataManip/tst_psMatrix05.c (modified) (2 diffs)

trunk/psLib/test/dataManip/tst_psMatrix05.c

@@ -10 +10 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-04-07 20:27:42 $
+*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-06-08 22:28:08 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -50 +50 @@
     psImage *inImage232 = NULL;
 
-    double truthMatrix[3][3] = {{ 8.000000, 20.000000},
-                                {-4.000000, 11.000000}};
-
-
-
+    double truthMatrix[3][3] = {{  0.0, 52.0},
+                                {-14.0, 51.0}};
 
     // Test A - Create input and output images
     printPositiveTestHeader(stdout, "psMatrix", "Create input and output images");
     outImage = (psImage*) psImageAlloc(2, 2, PS_TYPE_F64);
-    inImage1 = (psImage*) psImageAlloc(2, 2, PS_TYPE_F64);
-    inImage2 = (psImage*) psImageAlloc(2, 2, PS_TYPE_F64);
+    inImage1 = (psImage*) psImageAlloc(3, 2, PS_TYPE_F64);
+    inImage2 = (psImage*) psImageAlloc(2, 3, PS_TYPE_F64);
     inImage1->data.F64[0][0] = 2;
     inImage1->data.F64[0][1] = 3;
+    inImage1->data.F64[0][2] = 4;
     inImage1->data.F64[1][0] = -1;
     inImage1->data.F64[1][1] = 2;
+    inImage1->data.F64[1][2] = 5;
     inImage2->data.F64[0][0] = 4;
     inImage2->data.F64[0][1] = 1;
     inImage2->data.F64[1][0] = 0;
     inImage2->data.F64[1][1] = 6;
+    inImage2->data.F64[2][0] = -2;
+    inImage2->data.F64[2][1] = 8;
     outImage32 = (psImage*)psImageAlloc(2, 2, PS_TYPE_F32);
-    inImage132 = (psImage*)psImageAlloc(2, 2, PS_TYPE_F32);
-    inImage232 = (psImage*)psImageAlloc(2, 2, PS_TYPE_F32);
+    inImage132 = (psImage*)psImageAlloc(3, 2, PS_TYPE_F32);
+    inImage232 = (psImage*)psImageAlloc(2, 3, PS_TYPE_F32);
     inImage132->data.F32[0][0] = 2;
     inImage132->data.F32[0][1] = 3;
+    inImage132->data.F32[0][2] = 4;
     inImage132->data.F32[1][0] = -1;
     inImage132->data.F32[1][1] = 2;
+    inImage132->data.F32[1][2] = 5;
     inImage232->data.F32[0][0] = 4;
     inImage232->data.F32[0][1] = 1;
     inImage232->data.F32[1][0] = 0;
     inImage232->data.F32[1][1] = 6;
+    inImage232->data.F32[2][0] = -2;
+    inImage232->data.F32[2][1] = 8;
     printFooter( stdout, "psMatrix", "Create input and output images", true );