--- trunk/OOPSE/libmdtools/Functor.hpp	2004/01/13 22:12:32	939
+++ trunk/OOPSE/libmdtools/Functor.hpp	2004/02/04 22:26:00	1023
@@ -1,31 +1,78 @@
-#ifndef _FUNCTOR_H
+#ifndef _FUNCTOR_H_
 #define _FUNCTOR_H_
 
+#include <vector>
+
+using namespace std;
+
+class ObjFunctor0{
+  public:
+
+    virtual ~ObjFunctor0() {}
+    virtual double operator()(vector<double>&)=0;  
+    
+};
+
+class PtrFunctor0 : public 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 
  */
  
-class ObjFunctor{
+class ObjFunctor1{
 
   public:
+    virtual ~ObjFunctor1() {}
     virtual double operator()(vector<double>&, vector<double>&)=0;  
     
 };
 
-
-
 //PtrFunctor class wraps a pointer which points to an objct function. 
 // PtrFunctor can be invoked by
 // functor(vector<double>&, vector<double>&)
-class PtrFunctor : ObjFunctor{
+class PtrFunctor1 : public ObjFunctor1{
 
   public:
 
-    PtrFunctor(double (*thePtrFunc)(vector<double>&, vector<double>&)){
+    PtrFunctor1(double (*thePtrFunc)(vector<double>&, vector<double>&)){
       ptrFunc = thePtrFunc;
     }
-    
+ 
     virtual double operator()(vector<double>& arg, vector<double>& grad){
        return (*ptrFunc)(arg, grad);
     };
@@ -37,15 +84,15 @@ class ClassMemObjFunctor : public ObjFunctor{
 //ClassMemObjFunctor class wraps a pointer pointing to a member function of a class
 //
 template<typename TClass>
-class ClassMemObjFunctor : public ObjFunctor{
+class ClassMemObjFunctor1 : public ObjFunctor1{
   public:
-    ClassMemObjFunctor(TClass* thePtrClass, double (TClass::*thePtrFunc)(vector<double>&, vector<double>&)){
+    ClassMemObjFunctor1(TClass* thePtrClass, double (TClass::*thePtrFunc)(vector<double>&, vector<double>&)){
       ptrClass = thePtrClass;
       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: