Changeset 6556 for branches/rel10_ifa/psModules/src/objects/pmModel.c

Timestamp:

Mar 8, 2006, 5:14:23 PM (20 years ago)

Author:

magnier

Message:

major rework of objects code

File:

• branches/rel10_ifa/psModules/src/objects/pmModel.c (modified) (2 diffs)

branches/rel10_ifa/psModules/src/objects/pmModel.c

@@ -1 @@
-/** @file  pmObjects.c
- *
- *  This file will ...
+/** @file  pmModel.c
+ *
+ *  Functions to define and manipulate object models
  *
  *  @author GLG, MHPCC
- *  @author EAM, IfA: significant modifications.
- *
- *  @version $Revision: 1.1.2.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-03-07 06:33:35 $
+ *  @author EAM, IfA
+ *
+ *  @version $Revision: 1.1.2.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-09 03:14:23 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -17 +17 @@
 #include <string.h>
 #include "pslib.h"
-#include "pmObjects.h"
-#include "pmModelGroup.h"
+#include "pmModel.h"
+
+/* The following types and functions need to be known by pmModel.c and are defined in
+   pmModelGroup.h.  The use of pmSource and other types in pmModelGroup.h prevent us from
+   directly including it here  ***/
+
+typedef psMinimizeLMChi2Func pmModelFunc;
+typedef bool (*pmModelFitStatusFunc)(pmModel *model);
+pmModelFunc pmModelFunc_GetFunction (pmModelType type);
+pmModelFitStatusFunc pmModelFitStatusFunc_GetFunction (pmModelType type);
+int pmModelParameterCount(pmModelType type);
 
 static void modelFree(pmModel *tmp)