Skip to content

Commit

Permalink
MINOR: [C++] Make argument name consistent (#44973)
Browse files Browse the repository at this point in the history
Followup to #44955

Authored-by: Antoine Pitrou <[email protected]>
Signed-off-by: Antoine Pitrou <[email protected]>
  • Loading branch information
pitrou authored Dec 9, 2024
1 parent 0d8c8d9 commit e747af6
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
26 changes: 13 additions & 13 deletions cpp/src/arrow/testing/math.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ namespace arrow {
namespace {

template <typename Float>
bool WithinUlpOneWay(Float left, Float right, int n_ulp) {
bool WithinUlpOneWay(Float left, Float right, int n_ulps) {
// The delta between 1.0 and the FP value immediately before it.
// We're using this value because `frexp` returns a mantissa between 0.5 and 1.0.
static const Float kOneUlp = Float(1.0) - std::nextafter(Float(1.0), Float(0.0));

DCHECK_GE(n_ulp, 1);
DCHECK_GE(n_ulps, 1);

if (left == 0) {
return left == right;
Expand All @@ -45,36 +45,36 @@ bool WithinUlpOneWay(Float left, Float right, int n_ulp) {

int left_exp;
Float left_mant = std::frexp(left, &left_exp);
Float delta = static_cast<Float>(n_ulp) * kOneUlp;
Float delta = static_cast<Float>(n_ulps) * kOneUlp;
Float lower_bound = std::ldexp(left_mant - delta, left_exp);
Float upper_bound = std::ldexp(left_mant + delta, left_exp);
return right >= lower_bound && right <= upper_bound;
}

template <typename Float>
bool WithinUlpGeneric(Float left, Float right, int n_ulp) {
bool WithinUlpGeneric(Float left, Float right, int n_ulps) {
if (!std::isfinite(left) || !std::isfinite(right)) {
return left == right;
}
return (std::abs(left) <= std::abs(right)) ? WithinUlpOneWay(left, right, n_ulp)
: WithinUlpOneWay(right, left, n_ulp);
return (std::abs(left) <= std::abs(right)) ? WithinUlpOneWay(left, right, n_ulps)
: WithinUlpOneWay(right, left, n_ulps);
}

template <typename Float>
void AssertWithinUlpGeneric(Float left, Float right, int n_ulp) {
if (!WithinUlpGeneric(left, right, n_ulp)) {
FAIL() << left << " and " << right << " are not within " << n_ulp << " ulps";
void AssertWithinUlpGeneric(Float left, Float right, int n_ulps) {
if (!WithinUlpGeneric(left, right, n_ulps)) {
FAIL() << left << " and " << right << " are not within " << n_ulps << " ulps";
}
}

} // namespace

bool WithinUlp(float left, float right, int n_ulp) {
return WithinUlpGeneric(left, right, n_ulp);
bool WithinUlp(float left, float right, int n_ulps) {
return WithinUlpGeneric(left, right, n_ulps);
}

bool WithinUlp(double left, double right, int n_ulp) {
return WithinUlpGeneric(left, right, n_ulp);
bool WithinUlp(double left, double right, int n_ulps) {
return WithinUlpGeneric(left, right, n_ulps);
}

void AssertWithinUlp(float left, float right, int n_ulps) {
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/arrow/testing/math.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
namespace arrow {

ARROW_TESTING_EXPORT
bool WithinUlp(float left, float right, int n_ulp);
bool WithinUlp(float left, float right, int n_ulps);
ARROW_TESTING_EXPORT
bool WithinUlp(double left, double right, int n_ulp);
bool WithinUlp(double left, double right, int n_ulps);

ARROW_TESTING_EXPORT
void AssertWithinUlp(float left, float right, int n_ulps);
Expand Down

0 comments on commit e747af6

Please sign in to comment.