--- trunk/OOPSE/libmdtools/ConjugateMinimizer.hpp	2004/01/20 20:32:57	969
+++ trunk/OOPSE/libmdtools/ConjugateMinimizer.hpp	2004/01/27 19:15:20	987
@@ -6,22 +6,27 @@ class ConjugateMinimizerBase : public MinimizeBase{
 class ConjugateMinimizerBase : public MinimizeBase{
   public:
     bool isSolvable(); 
+    virtual void Init() = 0;
+    virtual void Minimize() = 0;
+    virtual int step() = 0;
+    virtual int testConvergence() = 0;    
+    virtual void reset();
     void calcDirection(vector<double>& direction)  = 0;
     
   protected:
-    NLOPFirstDerive * model;
-    
+    NLModel0 * model;
+    vector<double> preGrad;    
 };
 
-class FRConjugateMinimizer : public ConjugateMinimizerBase{
+class FRConjugate : public ConjugateMinimizerBase{
   public:    
     void calcDirection(vector<double>& direction);
 
 };
 
-class PRConjugateMinimizer : public ConjugateMinimizerBase{
+class PRConjugate : public ConjugateMinimizerBase{
   public:
-    void calcDirection(vector<double>& direction)  = 0;
+    void calcDirection(vector<double>& direction);
 };
 
 #endif