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 1022 by tim, Tue Feb 3 22:54:52 2004 UTC vs.
Revision 1023 by tim, Wed Feb 4 22:26:00 2004 UTC

# Line 8 | Line 8 | class ConjugateMinimizerBase : public MinimizerUsingLi
8  
9    public:
10  
11 <    ConjugateMinimizerBase(NLModel1* nlmodel);
12 <    ~ConjugateMinimizerBase();
11 >    ConjugateMinimizerBase(NLModel1* nlmodel, MinimizerParameterSet* param);
12 >    ~ConjugateMinimizerBase() {}
13      
14 <    bool isSolvable();
15 <    virtual void Init();
16 <    virtual void Minimize();
14 >    bool isSolvable();
15 >    virtual void minimize();
16      virtual int checkConvergence();    
17      virtual void reset();
18      virtual void printMinizerInfo();
# Line 22 | Line 21 | class ConjugateMinimizerBase : public MinimizerUsingLi
21    protected:
22  
23      virtual double calcGamma(vector<double>& newGrad, vector<double>& oldGrad) = 0;
24 <    NLModel0 * model;
24 >    NLModel1 * model;
25      
26      vector<double> prevGrad;    
27      vector<double> gradient;
# Line 33 | Line 32 | class FRCGMinimizer : public ConjugateMinimizerBase{
32   //Fletcher-Reeves Conjugate Gradient Method
33   class FRCGMinimizer : public ConjugateMinimizerBase{
34  
35 +  public:
36 +    FRCGMinimizer(NLModel1* nlmodel, MinimizerParameterSet* param) :ConjugateMinimizerBase(nlmodel, param){}
37 +
38    protected:    
39  
40      double calcGamma(vector<double>& newGrad, vector<double>& oldGrad);
# Line 42 | Line 44 | class PRCGMinimizer : public ConjugateMinimizerBase{
44   //Polak-Reeves Conjugate Gradient Method
45   class PRCGMinimizer : public ConjugateMinimizerBase{
46  
47 +  public:
48 +    PRCGMinimizer(NLModel1* nlmodel, MinimizerParameterSet* param) :ConjugateMinimizerBase(nlmodel, param){}
49 +
50    protected:
51  
52      double calcGamma(vector<double>& newGrad, vector<double>& oldGrad);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines