--- trunk/OOPSE/libmdtools/ConjugateMinimizer.hpp	2004/02/03 20:43:08	1010
+++ trunk/OOPSE/libmdtools/ConjugateMinimizer.hpp	2004/02/03 22:54:52	1015
@@ -1,7 +1,7 @@
 #ifndef _CONJUGATEMINIMIZER_H_
 #define _CONJUGATEMINIMIZER_H_
 
-#include "MinimizerBase.hpp"
+#include "Minimizer.hpp"
 
 //abstract class of conjugate gradient minimizer
 class ConjugateMinimizerBase : public MinimizerUsingLineSearch{
@@ -17,10 +17,11 @@ class ConjugateMinimizerBase : public MinimizerUsingLi
     virtual int checkConvergence();    
     virtual void reset();
     virtual void printMinizerInfo();
+    virtual void writeOut(vector<double>& x, double iter) {}
     
   protected:
 
-    double calcGamma(vector<double>& newGrad, vector<double>& oldGrad) = 0;
+    virtual double calcGamma(vector<double>& newGrad, vector<double>& oldGrad) = 0;
     NLModel0 * model;
     
     vector<double> prevGrad;