Changeset 831 for trunk/psLib/src/math/psMatrix.c

Timestamp:

Jun 2, 2004, 1:29:39 PM (22 years ago)

Author:

harman

Message:

Changed psVector to be consistent with psImage

File:

• trunk/psLib/src/math/psMatrix.c (modified) (7 diffs)

trunk/psLib/src/math/psMatrix.c

@@ -20 +20 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-01 22:42:57 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-02 23:29:21 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -70 +70 @@
 /** Preprocessor macro to generate error a NULL image */
 #define PS_CHECK_NULL_VECTOR(NAME, RETURN)                                                          \
-if (NAME == NULL || NAME->vec.v == NULL) {                                                          \
+if (NAME == NULL || NAME->data.V == NULL) {                                                          \
     psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME);                          \
     return RETURN;                                                                                  \
@@ -78 +78 @@
 #define PS_CHECK_ALLOC_VECTOR(NAME, SIZE, PS_TYPE)                                                  \
 if(NAME == NULL) {                                                                                  \
-    NAME = psVectorAlloc(PS_TYPE, SIZE);                                                            \
+    NAME = psVectorAlloc(SIZE, PS_TYPE);                                                            \
 }
 
@@ -173 +173 @@
     perm.size = numCols;
     outPerm->n = numCols;
-    perm.data = outPerm->vec.v;
+    perm.data = outPerm->data.V;
     PS_GSL_MATRIX_INITIALIZE(lu, outImage->data.V[0]);
 
@@ -226 +226 @@
 
     perm.size = inPerm->n;
-    perm.data = inPerm->vec.v;
+    perm.data = inPerm->data.V;
 
     b.size = inVector->n;
     b.stride = 1;
-    b.data = inVector->vec.v;
+    b.data = inVector->data.V;
 
     x.size = numCols;
     x.stride = 1;
-    x.data = outVector->vec.v;
+    x.data = outVector->data.V;
 
     // Solve for {x} in equation: {b} = [A]{x}
@@ -483 +483 @@
 
     colSize = PSELEMTYPE_SIZEOF(inImage->type.type)*inImage->numRows;
-    memcpy(outVector->vec.v, inImage->data.V[0], colSize);
+    memcpy(outVector->data.V, inImage->data.V[0], colSize);
 
     return outVector;
@@ -510 +510 @@
 
     colSize = PSELEMTYPE_SIZEOF(outImage->type.type)*outImage->numRows;
-    memcpy(outImage->data.V[0], inVector->vec.v, colSize);
+    memcpy(outImage->data.V[0], inVector->data.V, colSize);
 
     return outImage;