--- trunk/OOPSE/libmdtools/Integrator.hpp	2003/08/25 21:51:30	718
+++ trunk/OOPSE/libmdtools/Integrator.hpp	2003/09/02 14:30:12	738
@@ -346,9 +346,9 @@ template<typename T> class ZConstraint : public T {
 template<typename T> class ZConstraint : public T {
   
   public: 
-  class ForceSubstractionPolicy{
+  class ForceSubtractionPolicy{
     public:
-      ForceSubstractionPolicy(ZConstraint<T>* integrator) {zconsIntegrator = integrator;}
+      ForceSubtractionPolicy(ZConstraint<T>* integrator) {zconsIntegrator = integrator;}
 
       virtual void update() = 0;    
       virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) = 0;
@@ -360,9 +360,9 @@ template<typename T> class ZConstraint : public T {
      ZConstraint<T>* zconsIntegrator;;
   };
 
-  class PolicyByNumber : ForceSubstractionPolicy{
+  class PolicyByNumber : public ForceSubtractionPolicy{
     public:
-      PolicyByNumber(ZConstraint<T>* integrator) :ForceSubstractionPolicy(integrator) {}    
+      PolicyByNumber(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}    
       virtual void update();    
       virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) ;
       virtual double getZFOfMovingMols(Atom* atom, double totalForce) ;
@@ -373,9 +373,9 @@ template<typename T> class ZConstraint : public T {
     int totNumOfMovingAtoms;
   };
 
-  class PolicyByMass :ForceSubstractionPolicy{
+  class PolicyByMass : public ForceSubtractionPolicy{
     public:
-      PolicyByMass(ZConstraint<T>* integrator) :ForceSubstractionPolicy(integrator) {}  
+      PolicyByMass(ZConstraint<T>* integrator) :ForceSubtractionPolicy(integrator) {}  
       
       virtual void update();    
       virtual double getZFOfFixedZMols(Molecule* mol, Atom* atom, double totalForce) ;
@@ -467,8 +467,8 @@ template<typename T> class ZConstraint : public T {
   double calcSysCOMVel();
   double calcTotalForce();
   
-  ForceSubstractionPolicy* forcePolicy; //force substration policy
-  friend class ForceSubstractionPolicy;
+  ForceSubtractionPolicy* forcePolicy; //force substration policy
+  friend class ForceSubtractionPolicy;
 
 };