Changeset 2283 in Sophya for trunk/SophyaLib/NTools/integ.h

Timestamp:

Nov 29, 2002, 3:03:45 PM (23 years ago)

Author:

plaszczy

Message:

ajout de classfunc et changements dans integ pour que ca colle

File:

• trunk/SophyaLib/NTools/integ.h (modified) (4 diffs)

trunk/SophyaLib/NTools/integ.h

@@ -10 +10 @@
 #include "pexceptions.h"
 #include <set>
+#include "classfunc.h"
 
 namespace SOPHYA {
@@ -17 +18 @@
 class Integrator {
 public:
-  typedef double(*FUNC)(double);
+  //typedef double(*FUNC)(double);
+  typedef ClassFunc *FUNC;
+  typedef double (*fun)(double);
 
   Integrator();
   Integrator(FUNC, double xmin, double xmax);
   Integrator(FUNC);
+
+  Integrator(fun, double xmin, double xmax);
+  Integrator(fun);
+
   Integrator(GeneralFunction*, double* par, double xmin, double xmax);
   Integrator(GeneralFunction*, double* par);
@@ -60 +67 @@
   TrpzInteg(FUNC, double xmin, double xmax);
   TrpzInteg(FUNC);
+  TrpzInteg(fun, double xmin, double xmax);
+  TrpzInteg(fun);
   TrpzInteg(GeneralFunction*, double* par, double xmin, double xmax);
   TrpzInteg(GeneralFunction*, double* par);
@@ -73 +82 @@
   GLInteg(FUNC, double xmin, double xmax);
   GLInteg(FUNC);
+  GLInteg(fun, double xmin, double xmax);
+  GLInteg(fun);
   GLInteg(GeneralFunction*, double* par, double xmin, double xmax);
   GLInteg(GeneralFunction*, double* par);