Changeset 14654

Timestamp:

Aug 23, 2007, 2:11:59 PM (19 years ago)

Author:

magnier

Message:

update to new apis

Location:

trunk/psModules/test/objects

Files:

• tap_pmSourceFitModel.c (modified) (1 diff)
• tap_pmSourceFitModel_Delta.c (modified) (2 diffs)
• tst_pmObjects01.c (modified) (2 diffs)

trunk/psModules/test/objects/tap_pmSourceFitModel.c

@@ -117 +117 @@
     source->moments = pmMomentsAlloc ();
 
-    pmModelType type = pmModelSetType ("PS_MODEL_GAUSS");
+    pmModelType type = pmModelClassGetType ("PS_MODEL_GAUSS");
     source->modelEXT = pmModelAlloc (type);
 

trunk/psModules/test/objects/tap_pmSourceFitModel_Delta.c

@@ -35 +35 @@
     source->moments = pmMomentsAlloc ();
 
-    pmModelType type = pmModelSetType ("PS_MODEL_GAUSS");
+    pmModelType type = pmModelClassGetType ("PS_MODEL_GAUSS");
     source->modelEXT = pmModelAlloc (type);
 
@@ -71 +71 @@
     pmModel *guess;
 
-    type = pmModelSetType ("PS_MODEL_PGAUSS");
+    type = pmModelClassGetType ("PS_MODEL_PGAUSS");
     guess = pmModelAlloc (type);
 

trunk/psModules/test/objects/tst_pmObjects01.c

@@ -31 +31 @@
     most of psObjects.c is not tested
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-03-04 01:01:34 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-08-24 00:11:59 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -186 +186 @@
     //
     psS32 i = 0;
-    while (0 != pmModelParameterCount(i)) {
-        printf("Testing pmModelAlloc(%s)...\n", pmModelGetType(0));
+    while (0 != pmModelClassParameterCount(i)) {
+        printf("Testing pmModelAlloc(%s)...\n", pmModelClassGetName(0));
         pmModel *tmpModel = pmModelAlloc(i);
         if (tmpModel == NULL) {
-            printf("TEST ERROR: pmModelAlloc(%s) returned a NULL pmModel\n", pmModelGetType(0));
+            printf("TEST ERROR: pmModelAlloc(%s) returned a NULL pmModel\n", pmModelClassGetName(0));
             testStatus = false;
         } else {