Parent Directory
|
Revision Log
import changes from math development branches for subdirectory math. List of changes in detail:
mathcore:
---------
MinimizerOptions:
new class for storing Minimizer option, with static default values that can be
changed by the user
FitConfig:
- use default values from MinimizerOption class
- rename method to create parameter settings from a function
FitUtil.cxx:
improve the derivative calculations used in the effective chi2 and in Fumili and
fix a bug for evaluation of likelihood or chi2 terms.
In EvaluatePdf() work and return the log of the pdf.
FitResult:
- improve the class by adding extra information like, num. of free parameters,
minimizer status, global correlation coefficients, information about fixed
and bound parameters.
- add method for getting fit confidence intervals
- improve print method
DataRange:
add method SetRange to distinguish from AddRange. SetRange deletes the existing
ranges.
ParamsSettings: make few methods const
FCN functions (Chi2FCN, LogLikelihoodFCN, etc..)
move some common methods and data members in base class (FitMethodFunction)
RootFinder: add template Solve() for any callable function.
mathmore:
--------
minimizer classes: fill status information
GSLNLSMinimizer: return error and covariance matrix
minuit2:
-------
Minuit2Minimizer: fill status information
DavidonErrorUpdator: check that delgam or gvg are not zero ( can happen when dg = 0)
FumiliFCNAdapter: work on the log of pdf
minuit:
-------
TLinearMinimizer: add support for robust fitting
TMinuitMinimizer: fill status information and fix a bug in filling the correlation matrix.
fumili:
------
add TFumiliMinimizer:
wrapper class for TFumili using Minimizer interface
// @(#)root/mathmore:$Id$
// Author: L. Moneta Wed Dec 20 17:26:06 2006
/**********************************************************************
* *
* Copyright (c) 2006 LCG ROOT Math Team, CERN/PH-SFT *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
* as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this library (see file COPYING); if not, write *
* to the Free Software Foundation, Inc., 59 Temple Place, Suite *
* 330, Boston, MA 02111-1307 USA, or contact the author. *
* *
**********************************************************************/
// Header file for class GSLMultiFit
#ifndef ROOT_Math_GSLMultiFit
#define ROOT_Math_GSLMultiFit
#include "gsl/gsl_vector.h"
#include "gsl/gsl_matrix.h"
#include "gsl/gsl_multifit_nlin.h"
#include "gsl/gsl_blas.h"
#include "GSLMultiFitFunctionWrapper.h"
#include "Math/IFunction.h"
#include <string>
#include <cassert>
namespace ROOT {
namespace Math {
/**
GSLMultiFit, internal class for implementing GSL non linear least square GSL fitting
@ingroup MultiMin
*/
class GSLMultiFit {
public:
/**
Default constructor
No need to specify the type sofar since only one solver exists so far
*/
GSLMultiFit () :
fSolver(0),
fVec(0),
fCov(0),
fType(gsl_multifit_fdfsolver_lmsder)
{}
/**
Destructor (no operations)
*/
~GSLMultiFit () {
if (fSolver) gsl_multifit_fdfsolver_free(fSolver);
if (fVec != 0) gsl_vector_free(fVec);
if (fCov != 0) gsl_matrix_free(fCov);
}
private:
// usually copying is non trivial, so we make this unaccessible
/**
Copy constructor
*/
GSLMultiFit(const GSLMultiFit &) {}
/**
Assignment operator
*/
GSLMultiFit & operator = (const GSLMultiFit & rhs) {
if (this == &rhs) return *this; // time saving self-test
return *this;
}
public:
/// create the minimizer from the type and size of number of fitting points and number of parameters
void CreateSolver(unsigned int npoints, unsigned int npar) {
if (fSolver) gsl_multifit_fdfsolver_free(fSolver);
fSolver = gsl_multifit_fdfsolver_alloc(fType, npoints, npar);
}
/// set the solver parameters
template<class Func>
int Set(const std::vector<Func> & funcVec, const double * x) {
// create a vector of the fit contributions
// create function wrapper from an iterator of functions
unsigned int npts = funcVec.size();
if (npts == 0) return -1;
unsigned int npar = funcVec[0].NDim();
typedef typename std::vector<Func> FuncVec;
//FuncIt funcIter = funcVec.begin();
fFunc.SetFunction(funcVec, npts, npar);
// create solver object
CreateSolver( npts, npar );
// set initial values
if (fVec != 0) gsl_vector_free(fVec);
fVec = gsl_vector_alloc( npar );
std::copy(x,x+npar, fVec->data);
assert(fSolver != 0);
return gsl_multifit_fdfsolver_set(fSolver, fFunc.GetFunc(), fVec);
}
std::string Name() const {
if (fSolver == 0) return "undefined";
return std::string(gsl_multifit_fdfsolver_name(fSolver) );
}
int Iterate() {
if (fSolver == 0) return -1;
return gsl_multifit_fdfsolver_iterate(fSolver);
}
/// parameter values at the minimum
const double * X() const {
if (fSolver == 0) return 0;
gsl_vector * x = gsl_multifit_fdfsolver_position(fSolver);
return x->data;
}
/// gradient value at the minimum
const double * Gradient() const {
if (fSolver == 0) return 0;
gsl_multifit_gradient(fSolver->J, fSolver->f,fVec);
return fVec->data;
}
/// return covariance matrix of the parameters
const double * CovarMatrix() const {
if (fSolver == 0) return 0;
if (fCov != 0) gsl_matrix_free(fCov);
unsigned int npar = fSolver->fdf->p;
fCov = gsl_matrix_alloc( npar, npar );
static double kEpsrel = 0.0001;
gsl_multifit_covar(fSolver->J, kEpsrel, fCov);
return fCov->data;
}
/// test gradient (ask from solver gradient vector)
int TestGradient(double absTol) const {
if (fSolver == 0) return -1;
Gradient();
return gsl_multifit_test_gradient( fVec, absTol);
}
/// test using abs and relative tolerance
/// |dx| < absTol + relTol*|x| for every component
int TestDelta(double absTol, double relTol) const {
if (fSolver == 0) return -1;
return gsl_multifit_test_delta(fSolver->dx, fSolver->x, absTol, relTol);
}
// calculate edm 1/2 * ( grad^T * Cov * grad )
double Edm() const {
// product C * g
double edm = -1;
const double * g = Gradient();
if (g == 0) return edm;
const double * c = CovarMatrix();
if (c == 0) return edm;
gsl_vector * tmp = gsl_vector_alloc( fSolver->fdf->p );
int status = gsl_blas_dgemv(CblasNoTrans, 1.0, fCov, fVec, 0.,tmp);
if (status != 0) return edm;
status = gsl_blas_ddot(fVec, tmp, &edm);
if (status != 0) return -1;
// need to divide by 2 ??
return 0.5*edm;
}
private:
GSLMultiFitFunctionWrapper fFunc;
gsl_multifit_fdfsolver * fSolver;
// cached vector to avoid re-allocating every time a new one
mutable gsl_vector * fVec;
mutable gsl_matrix * fCov;
const gsl_multifit_fdfsolver_type * fType;
};
} // end namespace Math
} // end namespace ROOT
#endif /* ROOT_Math_GSLMultiFit */
| Subversion Admin | ViewVC Help |
| Powered by ViewVC 1.0.9 |