# | Line 4 | Line 4 | |
---|---|---|
4 | #include "MinimizerBase.hpp" | |
5 | ||
6 | //abstract class of conjugate gradient minimizer | |
7 | < | class ConjugateMinimizerBase : public Minimize{ |
7 | > | class ConjugateMinimizerBase : public MinimizerUsingLineSearch{ |
8 | ||
9 | public: | |
10 | ||
# | Line 14 | Line 14 | class ConjugateMinimizerBase : public Minimize{ | |
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 |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |