Skip to content

Fix stress histogram test #505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dpiparo merged 2 commits into from
Apr 13, 2017
Merged

Fix stress histogram test #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6a6282
[Math] Handle denormals in AreEqualRel()
amadio Apr 13, 2017
7a35a34
Fix for stressHistogram test failure on 32bit machines
amadio Apr 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion math/mathcore/inc/TMath.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,8 @@ struct Limits {
}
inline Bool_t AreEqualRel(Double_t af, Double_t bf, Double_t relPrec) {
//return kTRUE if relative difference between af and bf is less than relPrec
return TMath::Abs(af-bf) <= 0.5*relPrec*(TMath::Abs(af)+TMath::Abs(bf));
return TMath::Abs(af - bf) <= 0.5 * relPrec * (TMath::Abs(af) + TMath::Abs(bf)) ||
TMath::Abs(af - bf) < Limits<Double_t>::Min(); // handle denormals
}

/* ******************** */
Expand Down
32 changes: 9 additions & 23 deletions test/stressHistogram.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7030,44 +7030,30 @@ int findBin(ROOT::Fit::BinData& bd, const double *x)
return -1;
}

bool operator ==(ROOT::Fit::BinData& bd1, ROOT::Fit::BinData& bd2)
bool operator==(ROOT::Fit::BinData &bd1, ROOT::Fit::BinData &bd2)
{
const unsigned int ndim = bd1.NDim();
const unsigned int npoints = bd1.NPoints();
const double eps = TMath::Limits<double>::Epsilon();

bool equals = true;

for ( unsigned int i = 0; i < npoints && equals; ++i )
{
for (unsigned int i = 0; i < npoints; ++i) {
double value1 = 0, error1 = 0;
const double *x1 = bd1.GetPoint(i, value1, error1);

// std::cout << "i: " << i
// << " x: ";
// std::copy(x1, x1+ndim, ostream_iterator<double>(std::cout, " "));
// std::cout << " val: " << value1
// << " error: " << error1
// << std::endl;

int bin = findBin(bd2, x1);
if ( bin < 0 )
Fatal("operator ==(ROOT::Fit::BinData& bd1, ROOT::Fit::BinData& bd2)","BIN NOT FOUND!");

double value2 = 0, error2 = 0;
const double *x2 = bd2.GetPoint(bin, value2, error2);

equals &= ( value1 == value2 );
equals &= ( error1 == error2 );
for ( unsigned int j = 0; j < ndim; ++j )
{
equals &= fabs(x1[j] - x2[j]) < 1E-15;
}
}
if (!TMath::AreEqualRel(value1, value2, eps)) return false;
if (!TMath::AreEqualRel(error1, error2, eps)) return false;

return equals;
for (unsigned int j = 0; j < ndim; ++j)
if (!TMath::AreEqualRel(x1[j], x2[j], eps)) return false;
}
return true;
}


int findBin(ROOT::Fit::SparseData& sd,
const std::vector<double>& minRef, const std::vector<double>& maxRef,
const double valRef, const double errorRef)
Expand Down