Changeset 6511 for trunk/psModules/test/imcombine

Timestamp:

Mar 3, 2006, 3:01:34 PM (20 years ago)

Author:

drobbin

Message:

Updated files to reflect psArray, psVector, & psPixels changes in psLib that set n=0 upon allocation.

Location:

trunk/psModules/test/imcombine

Files:

• tst_pmImageCombine.c (modified) (6 diffs)
• tst_pmReadoutCombine.c (modified) (3 diffs)

trunk/psModules/test/imcombine/tst_pmImageCombine.c

@@ -10 +10 @@
  *  XXX: Must test masks with pmRejectPixels()
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-10-10 21:58:34 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-04 01:01:34 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -67 +67 @@
     psArray *errors = psArrayAlloc(numImages);
     psArray *masks = psArrayAlloc(numImages);
+    images->n = images->nalloc;
+    errors->n = errors->nalloc;
+    masks->n = masks->nalloc;
     for (psS32 i = 0 ; i < numImages ; i++) {
         images->data[i] = (psPtr *) psImageAlloc(numCols, numRows, PS_TYPE_F32);
@@ -94 +97 @@
     psArray *errorsLong = psArrayAlloc(numImages+1);
     psArray *masksLong = psArrayAlloc(numImages+1);
+    imagesLong->n = imagesLong->nalloc;
+    errorsLong->n = errorsLong->nalloc;
+    masksLong->n = masksLong->nalloc;
     for (psS32 i = 0 ; i < numImages+1 ; i++) {
         imagesLong->data[i] = (psPtr *) psImageAlloc(numCols, numRows, PS_TYPE_F32);
@@ -121 +127 @@
     psArray *errorsBadType = psArrayAlloc(numImages);
     psArray *masksBadType = psArrayAlloc(numImages);
+    imagesBadType->n = imagesBadType->nalloc;
+    errorsBadType->n = errorsBadType->nalloc;
+    masksBadType->n = masksBadType->nalloc;
     for (psS32 i = 0 ; i < numImages ; i++) {
         imagesBadType->data[i] = (psPtr *) psImageAlloc(numCols, numRows, PS_TYPE_F64);
@@ -143 +152 @@
 
     psPixels *pixels = psPixelsAlloc(TST00_NUM_PIXELS);
+    pixels->n = pixels->nalloc;
     for (psS32 p = 0 ; p < TST00_NUM_PIXELS ; p++) {
         psS32 col =  genRanInt(0, numCols);
@@ -284 +294 @@
     psArray *expandTransforms = psArrayAlloc(numImages);
     psArray *contractTransforms = psArrayAlloc(numImages);
+    expandTransforms->n = expandTransforms->nalloc;
+    contractTransforms->n = contractTransforms->nalloc;
     for (psS32 im = 0 ; im < numImages ; im++) {
         psPlaneTransform *ptExpand = psPlaneTransformAlloc(2, 2);

trunk/psModules/test/imcombine/tst_pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-28 20:42:52 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-04 01:01:34 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -83 +83 @@
     psVector *zero = psVectorAlloc(NUM_READOUTS, PS_TYPE_F32);
     psVector *scale = psVectorAlloc(NUM_READOUTS, PS_TYPE_F32);
+    zero->n = zero->nalloc;
+    scale->n = scale->nalloc;
     printPositiveTestHeader(stdout, "pmReadoutCombine", "simpleCombineNoOverlap");
 
@@ -207 +209 @@
     psVector *scaleBig = psVectorAlloc(NUM_READOUTS*2, PS_TYPE_F32);
     psVector *scaleF64 = psVectorAlloc(NUM_READOUTS, PS_TYPE_F64);
+    zero->n = zero->nalloc;
+    zeroHalf->n = zeroHalf->nalloc;
+    zeroBig->n = zeroBig->nalloc;
+    zeroF64->n = zeroF64->nalloc;
+    scale->n = scale->nalloc;
+    scaleHalf->n = scaleHalf->nalloc;
+    scaleBig->n = scaleBig->nalloc;
+    scaleF64->n = scaleF64->nalloc;
     for (i=0;i<NUM_READOUTS;i++) {
         zero->data.F32[i] = 3.0;