ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/ConjugateMinimizer.hpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/ConjugateMinimizer.hpp (file contents):
Revision 1000 by tim, Fri Jan 30 21:47:22 2004 UTC vs.
Revision 1015 by tim, Tue Feb 3 22:54:52 2004 UTC

# Line 1 | Line 1
1   #ifndef _CONJUGATEMINIMIZER_H_
2   #define _CONJUGATEMINIMIZER_H_
3  
4 < #include "MinimizerBase.hpp"
4 > #include "Minimizer.hpp"
5  
6   //abstract class of conjugate gradient minimizer
7 < class ConjugateMinimizerBase : public MinimizeBase{
7 > class ConjugateMinimizerBase : public MinimizerUsingLineSearch{
8  
9    public:
10  
# Line 14 | Line 14 | class ConjugateMinimizerBase : public MinimizeBase{
14      bool isSolvable();
15      virtual void Init();
16      virtual void Minimize();
17 <    virtual int isConvergenceAchieved();    
17 >    virtual int checkConvergence();    
18      virtual void reset();
19      virtual void printMinizerInfo();
20 +    virtual void writeOut(vector<double>& x, double iter) {}
21      
22    protected:
23  
24 <    double calcGamma(vector<double>& newGrad, vector<double>& oldGrad) = 0;
24 >    virtual double calcGamma(vector<double>& newGrad, vector<double>& oldGrad) = 0;
25      NLModel0 * model;
26      
27      vector<double> prevGrad;    

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines