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/mathcore:$Id$
// Author: L. Moneta Wed Aug 30 11:05:02 2006
/**********************************************************************
* *
* Copyright (c) 2006 LCG ROOT Math Team, CERN/PH-SFT *
* *
* *
**********************************************************************/
// Header file for class DataRange
#ifndef ROOT_Fit_DataRange
#define ROOT_Fit_DataRange
#include <vector>
namespace ROOT {
namespace Fit {
//___________________________________________________________________________________
/**
class describing the range in the coordinates
it supports multiple range in a coordinate.
The rnage dimension is the dimension of the coordinate, its size is
the number of interval for each coordinate.
Default range is -inf, inf
Range can be modified with the add range method
@ingroup FitData
*/
class DataRange {
public:
typedef std::vector<std::pair<double,double> > RangeSet;
typedef std::vector< RangeSet > RangeIntervals;
/**
Default constructor (infinite range)
*/
explicit DataRange (unsigned int dim = 1) :
fRanges ( std::vector<RangeSet> (dim) )
{}
/**
construct a range for [xmin, xmax]
*/
DataRange(double xmin, double xmax);
/**
construct a range for [xmin, xmax] , [ymin, ymax]
*/
DataRange(double xmin, double xmax, double ymin, double ymax);
/**
construct a range for [xmin, xmax] , [ymin, ymax] , [zmin, zmax]
*/
DataRange(double xmin, double xmax, double ymin, double ymax, double zmin, double zmax);
/**
get range dimension
*/
unsigned int NDim() const { return fRanges.size(); }
/**
return range size for coordinate icoord (starts from zero)
Size == 0 indicates no range is present [-inf, + inf]
*/
unsigned int Size(unsigned int icoord) const {
return icoord < fRanges.size() ? fRanges[icoord].size() : 0;
}
/**
return the vector of ranges for the coordinate icoord
*/
const RangeSet & Ranges(unsigned int icoord) const {
// return icoord < fRanges.size() ? fRanges[icoord] : RangeSet();
return fRanges.at(icoord);
}
/**
return the first range for the coordinate icoord.
Useful method when only one range is present for the given coordinate
*/
std::pair<double, double> operator() (unsigned int icoord) const {
return Size(icoord) > 0 ? fRanges[icoord].front() : std::make_pair<double,double>(0,0);
}
/**
get the first range for given coordinate
*/
void GetRange(unsigned int icoord, double & xmin, double & xmax) const {
if (Size(icoord) == 0) {
xmin = 0;
xmax = 0;
return;
}
xmin = fRanges[icoord].front().first;
xmax = fRanges[icoord].front().second;
}
/**
get range for the x - coordinate
*/
void GetRange(double & xmin, double & xmax) const { GetRange(0,xmin,xmax); }
/**
get range for the x and y coordinates
*/
void GetRange(double & xmin, double & xmax, double & ymin, double & ymax) const {
GetRange(0,xmin,xmax); GetRange(1,ymin,ymax);
}
/**
get range for the x and y and z coordinates
*/
void GetRange(double & xmin, double & xmax, double & ymin, double & ymax, double & zmin, double & zmax) const {
GetRange(0,xmin,xmax); GetRange(1,ymin,ymax); GetRange(2,zmin,zmax);
}
/**
Destructor (no operations)
*/
~DataRange () {}
/**
add a range [xmin,xmax] for the new coordinate icoord
Adding a range does not delete existing one, but takes the OR with
existing ranges.
if want to replace range use method SetRange, which replace range with existing one
*/
void AddRange(unsigned int icoord , double xmin, double xmax );
/**
add a range [xmin,xmax] for the first coordinate icoord
*/
void AddRange(double xmin, double xmax ) { AddRange(0,xmin,xmax); }
/**
add a range [xmin,xmax] for the first and [ymin,ymax] for the second coordinate
*/
void AddRange(double xmin, double xmax, double ymin, double ymax ) { AddRange(0,xmin,xmax); AddRange(1,ymin,ymax); }
/**
add a range [xmin,xmax] for the first and [ymin,ymax] for the second coordinate and
[zmin,zmax] for the third coordinate
*/
void AddRange(double xmin, double xmax, double ymin, double ymax, double zmin, double zmax ) {
AddRange(0,xmin,xmax); AddRange(1,ymin,ymax); AddRange(2,zmin,zmax); }
/**
set a range [xmin,xmax] for the new coordinate icoord
If more range exists for other coordinates, delete the existing one and use it the new one
Use Add range if want to keep the union of the existing ranges
*/
void SetRange(unsigned int icoord , double xmin, double xmax );
/**
set a range [xmin,xmax] for the first coordinate icoord
*/
void SetRange(double xmin, double xmax ) { SetRange(0,xmin,xmax); }
/**
set a range [xmin,xmax] for the first and [ymin,ymax] for the second coordinate
*/
void SetRange(double xmin, double xmax, double ymin, double ymax ) { SetRange(0,xmin,xmax); SetRange(1,ymin,ymax); }
/**
set a range [xmin,xmax] for the first and [ymin,ymax] for the second coordinate and
[zmin,zmax] for the third coordinate
*/
void SetRange(double xmin, double xmax, double ymin, double ymax, double zmin, double zmax ) {
SetRange(0,xmin,xmax); SetRange(1,ymin,ymax); SetRange(2,zmin,zmax); }
/**
clear all ranges in one coordinate (is now -inf, +inf)
*/
void Clear (unsigned int icoord = 0 );
/**
check if a point is inside the range for the given coordinate
*/
bool IsInside(double x, unsigned int icoord = 0) const;
protected:
/**
internal function to remove all the existing ranges between xmin and xmax
called when a new range is inserted
*/
void CleanRangeSet(unsigned int icoord, double xmin, double xmax);
private:
RangeIntervals fRanges; // list of all ranges
};
} // end namespace Fit
} // end namespace ROOT
#endif /* ROOT_Fit_DataRange */
| Subversion Admin | ViewVC Help |
| Powered by ViewVC 1.0.9 |