Refined interface for Conjugate Gradient

Some interface was refined (most notably, the method for returning
Hessian was removed and the method for getting gradient was added as
optional to base Solver::Function class) and basic code for
setters/getters was added. Now is the time for the real work on an
algorithm.
This commit is contained in:
Alex Leontiev
2013-09-22 00:14:49 +08:00
parent eb1333d0a8
commit 581d454536
5 changed files with 157 additions and 12 deletions

View File

@@ -55,6 +55,7 @@ public:
public:
virtual ~Function() {}
virtual double calc(const double* x) const = 0;
virtual void getGradient(const double* /*x*/,double* /*grad*/) {}
};
virtual Ptr<Function> getFunction() const = 0;
@@ -86,17 +87,7 @@ CV_EXPORTS_W Ptr<DownhillSolver> createDownhillSolver(const Ptr<Solver::Function
TermCriteria termcrit=TermCriteria(TermCriteria::MAX_ITER+TermCriteria::EPS,5000,0.000001));
//! conjugate gradient method
class CV_EXPORTS ConjGradSolver : public Solver
{
public:
class CV_EXPORTS Function : public Solver::Function
{
public:
//! gradient is like the first derivative for multivar function
virtual void getGradient(const double* x,double* buf)const=0;
//! Jacobian is like the second derivative
virtual void getJacobian(const double* x)const=0;
};
class CV_EXPORTS ConjGradSolver : public Solver{
};
CV_EXPORTS_W Ptr<ConjGradSolver> createConjGradSolver(const Ptr<Solver::Function>& f=Ptr<ConjGradSolver::Function>(),