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

Comparing trunk/OOPSE/libmdtools/Minimizer1D.hpp (file contents):
Revision 1004 by tim, Mon Feb 2 20:29:41 2004 UTC vs.
Revision 1005 by tim, Tue Feb 3 15:21:32 2004 UTC

# Line 17 | Line 17 | class Minimizer1D : public MinimizerBase{
17      virtual bool isSolvable();
18      
19      virtual void Minimize() = 0;
20 <    virtual void Minimize(vector<double>& direction, double left, double right);
20 >    virtual void Minimize(vector<double>& direction, double left, double right){
21 >      setRange(left, right);
22 >      setDirection(direction);
23 >      minimize();
24 >    }
25  
22 –    virtual int checkConvergence();
23 –
26      void setRange(double left, double right) {leftFVal = left, rightVal = right;}
27      void setDirection(vector<double>& direction) {this->direction = direction;}
28      double getMinVar() {return minVar;}
# Line 38 | Line 40 | class Minimizer1D : public MinimizerBase{
40      NLModel* model;
41      double leftVar;
42      double rightVar;
41 –    double fLeft;
42 –    double fRight;
43      double minVar;
44 <    double fMinVar;
45 <    double prevMinVar;
46 <    double fPrevMinVar;
47 <    
44 >     double prevMinVar;
45 >    
46      vector<double> direction;
47  
48      int maxIteration;
# Line 56 | Line 54 | class GoldenSectionMinimizer : public Minimizer1D{
54  
55    public:
56  
57 <    GoldenSectionMinimizer(NLModel* nlp) : Minimizer1D(nlp) {}
57 >    GoldenSectionMinimizer(NLModel* nlp);
58      void Minimize();
59 <
59 >    
60 >    virtual int checkConvergence();
61 >    
62    protected:
63 +
64 +    double fMinVar;
65 +    double fPrevMinVar;
66      
67      double fAlpha;
68      double fBeta;
# Line 70 | Line 73 | class BrentMinimizer : public Minimizer1D{
73  
74   class BrentMinimizer : public Minimizer1D{
75    public:
76 +    
77      BrentMinimizer(NLModel* nlp);
78 +
79      void minimize();
80 +
81 +    virtual int checkConvergence();
82    protected:
83 +
84 +    double fMinVar;
85 +    double fPrevMinVar;
86 +    double midVar;
87      
88   };
89   #endif

Diff Legend

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