Changeset 25766 for branches/eam_branches/20090820/psModules/test/objects/tap_pmModel.c

Timestamp:

Oct 2, 2009, 5:10:19 PM (17 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/20090820

Files:

• . (modified) (1 prop)
• psModules/test/objects/tap_pmModel.c (modified) (3 diffs)

branches/eam_branches/20090820/psModules/test/objects/tap_pmModel.c

@@ -77 +77 @@
         ok(model->nDOF == 0, "pmModelAlloc() set pmModel->nDOF correctly");
         ok(model->nIter == 0, "pmModelAlloc() set pmModel->nIter correctly");
-        ok(model->radiusFit == 0, "pmModelAlloc() set pmModel->radiusFit correctly");
+        ok(model->fitRadius == 0, "pmModelAlloc() set pmModel->fitRadius correctly");
         ok(model->flags == PM_MODEL_STATUS_NONE, "pmModelAlloc() set pmModel->flags correctly");
         ok(model->residuals == NULL, "pmModelAlloc() set pmModel->residuals correctly");
@@ -132 +132 @@
         modelSrc->nIter = 3;
         modelSrc->flags = PM_MODEL_STATUS_NONE;
-        modelSrc->radiusFit = 4;
+        modelSrc->fitRadius = 4;
         pmModel *modelDst = pmModelCopy(modelSrc);
         ok(modelDst != NULL && psMemCheckModel(modelDst), "pmModelCopy() returned a non-NULL pmModel");
@@ -139 +139 @@
         ok(modelDst->nIter == 3, "pmModelCopy() set the pmModel->nIter member correctly");
         ok(modelDst->flags == PM_MODEL_STATUS_NONE, "pmModelCopy() set the pmModel->flags member correctly");
-        ok(modelDst->radiusFit == 4, "pmModelCopy() set the pmModel->radiusFit member correctly");
+        ok(modelDst->fitRadius == 4, "pmModelCopy() set the pmModel->fitRadius member correctly");
 
         psFree(modelSrc);