Changeset 9730 for trunk/psModules/src/objects/pmSourceFitModel.c

Timestamp:

Oct 24, 2006, 12:55:05 PM (20 years ago)

Author:

Paul Price

Message:

Following today's meeting, we agreed that psVectorAlloc (and therefore
psArrayAlloc also) shall set the number of elements in use to equal the
number of elements allocated. We introduce new functions,
psVectorAllocEmpty and psArrayAllocEmpty, that allocate a vector and set
the length to zero.

File:

• trunk/psModules/src/objects/pmSourceFitModel.c (modified) (11 diffs)

trunk/psModules/src/objects/pmSourceFitModel.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-13 22:11:02 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-24 22:55:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -78 +78 @@
 
     // construct the coordinate and value entries
-    psArray *x = psArrayAlloc(nPix);
-    psVector *y = psVectorAlloc(nPix, PS_TYPE_F32);
-    psVector *yErr = psVectorAlloc(nPix, PS_TYPE_F32);
+    psArray *x = psArrayAllocEmpty(nPix);
+    psVector *y = psVectorAllocEmpty(nPix, PS_TYPE_F32);
+    psVector *yErr = psVectorAllocEmpty(nPix, PS_TYPE_F32);
 
     nPix = 0;
@@ -95 +95 @@
 
             psVector *coord = psVectorAlloc(2, PS_TYPE_F32);
-            coord->n = 2;
 
             // Convert i/j to image space:
@@ -128 +127 @@
     // set parameter mask based on fitting mode
     paramMask = psVectorAlloc (params->n, PS_TYPE_U8);
-    paramMask->n = params->n;
     psVectorInit (paramMask, 1);
 
@@ -208 +206 @@
     if (paramMask != NULL) {
         psVector *delta = psVectorAlloc (params->n, PS_TYPE_F64);
-        delta->n = params->n;
         psMinimizeGaussNewtonDelta(delta, params, NULL, x, y, yErr, modelFunc);
         for (int i = 0; i < dparams->n; i++) {
@@ -272 +269 @@
     onePar = psVectorAlloc (nPar, PS_DATA_F32);
     oneDeriv = psVectorAlloc (nPar, PS_DATA_F32);
-    onePar->n = oneDeriv->n = nPar;
 
     return true;
@@ -357 +353 @@
     psVector *params = psVectorAlloc (nSrc*nPar + 1, PS_TYPE_F32);
     psVector *dparams = psVectorAlloc (nSrc*nPar + 1, PS_TYPE_F32);
-    params->n = params->nalloc;
-    dparams->n = dparams->nalloc;
 
     pmModelLimits modelLimits = pmModelLimits_GetFunction (model->type);
@@ -373 +367 @@
     constrain->paramMask = psVectorAlloc (nSrc*nPar + 1, PS_TYPE_U8);
     constrain->paramDelta = psVectorAlloc (nSrc*nPar + 1, PS_TYPE_F32);
-    constrain->paramMin->n = constrain->paramMin->nalloc;
-    constrain->paramMax->n = constrain->paramMax->nalloc;
-    constrain->paramMask->n = constrain->paramMask->nalloc;
-    constrain->paramDelta->n = constrain->paramDelta->nalloc;
 
     // set the parameter guesses and constraints for the multiple models
@@ -459 +449 @@
 
     // construct the coordinate and value entries
-    psArray *x = psArrayAlloc(nPix);
-    psVector *y = psVectorAlloc(nPix, PS_TYPE_F32);
-    psVector *yErr = psVectorAlloc(nPix, PS_TYPE_F32);
+    psArray *x = psArrayAllocEmpty(nPix);
+    psVector *y = psVectorAllocEmpty(nPix, PS_TYPE_F32);
+    psVector *yErr = psVectorAllocEmpty(nPix, PS_TYPE_F32);
 
     nPix = 0;
@@ -475 +465 @@
             }
             psVector *coord = psVectorAlloc(2, PS_TYPE_F32);
-            coord->n = 2;
 
             // Convert i/j to image space:
@@ -534 +523 @@
     if (constrain->paramMask != NULL) {
         psVector *delta = psVectorAlloc (params->n, PS_TYPE_F64);
-        delta->n = params->n;
         psMinimizeGaussNewtonDelta(delta, params, NULL, x, y, yErr, pmModelFitSet);
         for (int i = 0; i < dparams->n; i++) {