--- trunk/OOPSE/libmdtools/Functor.hpp	2004/01/27 19:15:20	987
+++ trunk/OOPSE/libmdtools/Functor.hpp	2004/02/03 17:10:44	1007
@@ -1,6 +1,51 @@
 #ifndef _FUNCTOR_H_
 #define _FUNCTOR_H_
 
+#include <vector>
+
+using namespace std;
+
+class ObjFunctor0{
+  public:
+    virtual double operator()(vector<double>&)=0;  
+};
+
+class PtrFunctor0 : ObjFunctor0{
+
+  public:
+
+    PtrFunctor0(double (*thePtrFunc)(vector<double>&)){
+      ptrFunc = thePtrFunc;
+    }
+    
+    virtual double operator()(vector<double>& arg){
+       return (*ptrFunc)(arg);
+    };
+    
+  protected:
+    double (*ptrFunc)(vector<double>&);
+};
+
+
+//ClassMemObjFunctor class wraps a pointer pointing to a member function of a class
+//
+template<typename TClass>
+class ClassMemObjFunctor0 : public ObjFunctor0{
+  public:
+    ClassMemObjFunctor0(TClass* thePtrClass, double (TClass::*thePtrFunc)(vector<double>&)){
+      ptrClass = thePtrClass;
+      ptrFunc = thePtrFunc;
+    }
+    
+    double operator()(vector<double>& arg){
+      return (*ptrClass.*ptrFunc)(arg);
+    }
+  protected:
+    
+    double (TClass::*ptrFunc)(vector<double>&);   
+    TClass* ptrClass;
+}; 
+
 /**
  * Abstract class of object function which have an overloaded method
  * to calculate the gradient 
@@ -13,8 +58,6 @@ class ObjFunctor1{
     
 };
 
-
-
 //PtrFunctor class wraps a pointer which points to an objct function. 
 // PtrFunctor can be invoked by
 // functor(vector<double>&, vector<double>&)
@@ -44,8 +87,8 @@ class ClassMemObjFunctor1 : public ObjFunctor1{
       ptrFunc = thePtrFunc;
     }
     
-    double operator()(vector<double>&, vector<double>&){
-      return (*ptrClass.*ptrFunc))(arg, grad);
+    double operator()(vector<double>&arg, vector<double>&grad){
+      return (*ptrClass.*ptrFunc)(arg, grad);
     }
   protected: