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 Oct 18 11:48:00 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 GSLMinimizer
#ifndef ROOT_Math_GSLMinimizer
#define ROOT_Math_GSLMinimizer
#ifndef ROOT_Math_Minimizer
#include "Math/Minimizer.h"
#endif
#ifndef ROOT_Math_IFunctionfwd
#include "Math/IFunctionfwd.h"
#endif
#ifndef ROOT_Math_IParamFunctionfwd
#include "Math/IParamFunctionfwd.h"
#endif
#include <vector>
#include <string>
namespace ROOT {
namespace Math {
/**
enumeration specifying the types of GSL minimizers
@ingroup MultiMin
*/
enum EGSLMinimizerType {
kConjugateFR,
kConjugatePR,
kVectorBFGS,
kVectorBFGS2,
kSteepestDescent
};
class GSLMultiMinimizer;
}
namespace Math {
//_____________________________________________________________________________________
/**
GSLMinimizer class.
Implementation of the ROOT::Math::Minimizer interface using the GSL multi-dimensional
minimization algorithms.
See <A HREF="http://www.gnu.org/software/gsl/manual/html_node/Multidimensional-Minimization.html">GSL doc</A>
from more info on the GSL minimization algorithms.
The class implements the ROOT::Math::Minimizer interface and can be instantiated using the
ROOT plugin manager (plugin name is "GSLMultiMin"). The varius minimization algorithms
(conjugatefr, conjugatepr, bfgs, etc..) can be passed as enumerations and also as a string.
The default algorithm is conjugatefr (Fletcher-Reeves conjugate gradient algorithm).
@ingroup MultiMin
*/
class GSLMinimizer : public ROOT::Math::Minimizer {
public:
/**
Default constructor
*/
GSLMinimizer (ROOT::Math::EGSLMinimizerType type = ROOT::Math::kConjugateFR );
/**
Constructor with a string giving name of algorithm
*/
GSLMinimizer (const char * type );
/**
Destructor
*/
virtual ~GSLMinimizer ();
private:
// usually copying is non trivial, so we make this unaccessible
/**
Copy constructor
*/
GSLMinimizer(const GSLMinimizer &) : Minimizer() {}
/**
Assignment operator
*/
GSLMinimizer & operator = (const GSLMinimizer & rhs) {
if (this == &rhs) return *this; // time saving self-test
return *this;
}
public:
/// set the function to minimize
virtual void SetFunction(const ROOT::Math::IMultiGenFunction & func);
/// set gradient the function to minimize
virtual void SetFunction(const ROOT::Math::IMultiGradFunction & func);
/// set free variable
virtual bool SetVariable(unsigned int ivar, const std::string & name, double val, double step);
#ifdef LATER
/// set lower limit variable (override if minimizer supports them )
virtual bool SetLowerLimitedVariable(unsigned int ivar , const std::string & name , double val , double step , double lower );
/// set upper limit variable (override if minimizer supports them )
virtual bool SetUpperLimitedVariable(unsigned int ivar , const std::string & name , double val , double step , double upper );
/// set upper/lower limited variable (override if minimizer supports them )
virtual bool SetLimitedVariable(unsigned int ivar , const std::string & name , double val , double step , double /* lower */, double /* upper */);
/// set fixed variable (override if minimizer supports them )
virtual bool SetFixedVariable(unsigned int /* ivar */, const std::string & /* name */, double /* val */);
#endif
/// method to perform the minimization
virtual bool Minimize();
/// return minimum function value
virtual double MinValue() const { return fMinVal; }
/// return expected distance reached from the minimum
virtual double Edm() const { return 0; } // not impl. }
/// return pointer to X values at the minimum
virtual const double * X() const { return &fValues.front(); }
/// return pointer to gradient values at the minimum
virtual const double * MinGradient() const;
/// number of function calls to reach the minimum
virtual unsigned int NCalls() const { return 0; } // not yet ipl.
/// this is <= Function().NDim() which is the total
/// number of variables (free+ constrained ones)
virtual unsigned int NDim() const { return fDim; }
/// number of free variables (real dimension of the problem)
/// this is <= Function().NDim() which is the total
virtual unsigned int NFree() const { return fDim; }
/// minimizer provides error and error matrix
virtual bool ProvidesError() const { return false; }
/// return errors at the minimum
virtual const double * Errors() const {
return 0;
}
/** return covariance matrices elements
if the variable is fixed the matrix is zero
The ordering of the variables is the same as in errors
*/
virtual double CovMatrix(unsigned int , unsigned int ) const { return 0; }
/// minos error for variable i, return false if Minos failed
virtual bool GetMinosError(unsigned int , double & /* errLow */ , double & /* errUp */ ) { return false; }
/// return reference to the objective function
///virtual const ROOT::Math::IGenFunction & Function() const;
protected:
private:
// dimension of the function to be minimized
unsigned int fDim;
ROOT::Math::GSLMultiMinimizer * fGSLMultiMin;
const ROOT::Math::IMultiGradFunction * fObjFunc;
double fMinVal;
double fLSTolerance; // Line Search Tolerance
std::vector<double> fValues;
//mutable std::vector<double> fErrors;
std::vector<double> fSteps;
std::vector<std::string> fNames;
};
} // end namespace Fit
} // end namespace ROOT
#endif /* ROOT_Math_GSLMinimizer */
| Subversion Admin | ViewVC Help |
| Powered by ViewVC 1.0.9 |