Changeset 3409 in Sophya for trunk/SophyaLib

Timestamp:

Nov 25, 2007, 7:13:51 PM (18 years ago)

Author:

cmv

Message:

operator(double) de ClassFunc et GenericFunc n'est plus const , cmv 25/11/2007

Location:

trunk/SophyaLib/NTools

Files:

• classfunc.h (modified) (2 diffs)
• genericfunc.h (modified) (1 diff)
• integ.cc (modified) (7 diffs)
• integ.h (modified) (5 diffs)

trunk/SophyaLib/NTools/classfunc.h

@@ -14 +14 @@
 public:
   virtual ~ClassFunc(void) { }
-  virtual double operator()(double x) const =0;
+  virtual double operator()(double x) =0;
 };
 
@@ -23 +23 @@
  public:
   Function(double (*g)(double)):f(g){}
-  virtual  double operator()(double x) const { return f(x);}
+  virtual  double operator()(double x) { return f(x);}
 };
 

trunk/SophyaLib/NTools/genericfunc.h

@@ -9 +9 @@
 
 //! Abstract interface definition for functions viewed as classes
-class GenericFunc : public ClassFunc {
+  class GenericFunc : public ClassFunc {
 public:
   GenericFunc(void) { }
   virtual ~GenericFunc(void) { }
 
-  virtual double operator()(double x) const {
+  virtual double operator()(double x) {
     cout<<"GenericFunc::operator(double) not implemented"<<endl;
     throw NotAvailableOperation("GenericFunc::operator(double) not implemented");
   }
 
-  virtual double operator()(double x,double y) const {
+  virtual double operator()(double x,double y) {
     cout<<"GenericFunc::operator(double,double) not implemented"<<endl;
     throw NotAvailableOperation("GenericFunc::operator(double,double) not implemented");
   }
 
-  virtual double operator()(double x,double y,double z) const {
+  virtual double operator()(double x,double y,double z) {
     cout<<"GenericFunc::operator(double,double,double) not implemented"<<endl;
     throw NotAvailableOperation("GenericFunc::operator(double,double,double) not implemented");
   }
 
-  virtual double operator()(double* x) const {
+  virtual double operator()(double* x) {
     cout<<"GenericFunc::operator(double*) not implemented"<<endl;
     throw NotAvailableOperation("GenericFunc::operator(double*) not implemented");
   }
 
-  virtual double operator()(vector<double>& x) const {
+  virtual double operator()(vector<double>& x) {
     cout<<"GenericFunc::operator(vector<double>&) not implemented"<<endl;
     throw NotAvailableOperation("GenericFunc::operator(vector<double>&) not implemented");

trunk/SophyaLib/NTools/integ.cc

@@ -35 +35 @@
 
 //! Constructeur à partir d'une classe-fonction, et des bornes d'intégration.
-Integrator::Integrator(ClassFunc const & f, double xmin, double xmax)
+Integrator::Integrator(ClassFunc & f, double xmin, double xmax)
 : mFunc(NULL), mClFun(&f), mGFF(NULL), mGFFParm(NULL),
   mNStep(50), mDX(-1), mReqPrec(-1),
@@ -54 +54 @@
   à [0,1], et on pourra les modifier plus tard.
 */
-Integrator::Integrator(ClassFunc const & f)
+Integrator::Integrator(ClassFunc & f)
 : mFunc(NULL), mClFun(&f), mGFF(NULL), mGFFParm(NULL),
   mNStep(50), mDX(-1), mReqPrec(-1),
@@ -159 +159 @@
 //! Spécifie la fonction à intégrer, sous forme double f(double).
 Integrator& 
-Integrator::SetFunc(ClassFunc const & f)
+Integrator::SetFunc(ClassFunc & f)
 {
   mFunc = NULL;
@@ -239 +239 @@
 {}
 
-TrpzInteg::TrpzInteg(ClassFunc const & f, double xmin, double xmax)
+TrpzInteg::TrpzInteg(ClassFunc & f, double xmin, double xmax)
 : Integrator(f, xmin, xmax)
 {}
@@ -247 +247 @@
 {}
 
-TrpzInteg::TrpzInteg(ClassFunc const & f)
+TrpzInteg::TrpzInteg(ClassFunc & f)
 : Integrator(f)
 {}
@@ -320 +320 @@
 
 
-GLInteg::GLInteg(ClassFunc const & f, double xmin, double xmax)
+GLInteg::GLInteg(ClassFunc & f, double xmin, double xmax)
 : Integrator(f, xmin, xmax), mXPos(NULL), mWeights(NULL), mOrder(8)
 {
@@ -332 +332 @@
 }
 
-GLInteg::GLInteg(ClassFunc const & f)
+GLInteg::GLInteg(ClassFunc & f)
 : Integrator(f), mXPos(NULL), mWeights(NULL), mOrder(8)
 {

trunk/SophyaLib/NTools/integ.h

@@ -21 +21 @@
 
   Integrator();
-  Integrator(ClassFunc const &, double xmin, double xmax);
-  Integrator(ClassFunc const &);
+  Integrator(ClassFunc &, double xmin, double xmax);
+  Integrator(ClassFunc &);
 
   Integrator(FUNC, double xmin, double xmax);
@@ -39 +39 @@
   virtual Integrator& ReqPrec(double);   // NOT YET !
   virtual Integrator& Limits(double xmin, double xmax);
-  virtual Integrator& SetFunc(ClassFunc const &);
+  virtual Integrator& SetFunc(ClassFunc &);
   virtual Integrator& SetFunc(FUNC);
   virtual Integrator& SetFunc(GeneralFunction*, double* par);
@@ -48 +48 @@
 protected:
   FUNC             mFunc;
-  ClassFunc const* mClFun;
+  ClassFunc *      mClFun;
   GeneralFunction* mGFF;
   double*          mGFFParm;
@@ -68 +68 @@
 public:
   TrpzInteg();
-  TrpzInteg(ClassFunc const &, double xmin, double xmax);
-  TrpzInteg(ClassFunc const &);
+  TrpzInteg(ClassFunc  &, double xmin, double xmax);
+  TrpzInteg(ClassFunc  &);
   TrpzInteg(FUNC, double xmin, double xmax);
   TrpzInteg(FUNC);
@@ -83 +83 @@
 public:
   GLInteg();
-  GLInteg(ClassFunc const &, double xmin, double xmax);
-  GLInteg(ClassFunc const &);
+  GLInteg(ClassFunc  &, double xmin, double xmax);
+  GLInteg(ClassFunc  &);
   GLInteg(FUNC, double xmin, double xmax);
   GLInteg(FUNC);