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

Timestamp:

Nov 2, 2006, 3:32:37 PM (19 years ago)

Author:

ansari

Message:

correction bug lie au delete de ClassFunc ds Integrator / petite amelioration interface Integrator - Reza 02/11/2006

File:

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

trunk/SophyaLib/NTools/integ.h

@@ -18 +18 @@
 class Integrator {
 public:
-  //typedef double(*FUNC)(double);
-  typedef ClassFunc *FUNC;
-  typedef double (*fun)(double);
+  typedef double(*FUNC)(double);
 
   Integrator();
+  Integrator(ClassFunc const &, double xmin, double xmax);
+  Integrator(ClassFunc const &);
+
   Integrator(FUNC, double xmin, double xmax);
   Integrator(FUNC);
-
-  Integrator(fun, double xmin, double xmax);
-  Integrator(fun);
 
   Integrator(GeneralFunction*, double* par, double xmin, double xmax);
@@ -41 +39 @@
   virtual Integrator& ReqPrec(double);   // NOT YET !
   virtual Integrator& Limits(double xmin, double xmax);
-  virtual Integrator& Func(FUNC);
-  virtual Integrator& Func(GeneralFunction*, double* par);
+  virtual Integrator& SetFunc(ClassFunc const &);
+  virtual Integrator& SetFunc(FUNC);
+  virtual Integrator& SetFunc(GeneralFunction*, double* par);
 
   virtual inline  int GetNStep(void) {return mNStep;}
@@ -49 +48 @@
 protected:
   FUNC             mFunc;
+  ClassFunc const* mClFun;
   GeneralFunction* mGFF;
   double*          mGFFParm;
@@ -68 +68 @@
 public:
   TrpzInteg();
+  TrpzInteg(ClassFunc const &, double xmin, double xmax);
+  TrpzInteg(ClassFunc const &);
   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);
@@ -83 +83 @@
 public:
   GLInteg();
+  GLInteg(ClassFunc const &, double xmin, double xmax);
+  GLInteg(ClassFunc const &);
   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);