[libcxx-commits] [libcxx] [libc++] Adjust some of the [rand.dist] critical values that are too strict (PR #88669)
via libcxx-commits
libcxx-commits at lists.llvm.org
Thu Apr 18 09:10:40 PDT 2024
github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code. :warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff 5927492e8e68c1ee5a0d84cf6c402a900aac4a3c 53830bfe40b220aec1ea19c167303d1e96fab290 -- libcxx/test/std/numerics/rand/rand.dist/rand.dist.bern/rand.dist.bern.bernoulli/eval.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.bern/rand.dist.bern.bernoulli/eval_param.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.bern/rand.dist.bern.bin/eval.PR44847.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.bern/rand.dist.bern.bin/eval.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.bern/rand.dist.bern.bin/eval_param.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.bern/rand.dist.bern.geo/eval.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.bern/rand.dist.bern.geo/eval_param.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.bern/rand.dist.bern.negbin/eval.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.bern/rand.dist.bern.negbin/eval_param.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.norm/rand.dist.norm.cauchy/eval.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.norm/rand.dist.norm.chisq/eval.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.norm/rand.dist.norm.chisq/eval_param.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.norm/rand.dist.norm.lognormal/eval.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.norm/rand.dist.norm.lognormal/eval_param.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.norm/rand.dist.norm.t/eval.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.norm/rand.dist.norm.t/eval_param.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.pois/rand.dist.pois.exp/eval.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.pois/rand.dist.pois.exp/eval_param.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.pois/rand.dist.pois.extreme/eval.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.pois/rand.dist.pois.extreme/eval_param.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.pois/rand.dist.pois.gamma/eval.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.pois/rand.dist.pois.gamma/eval_param.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.pois/rand.dist.pois.poisson/eval.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.pois/rand.dist.pois.poisson/eval_param.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.samp/rand.dist.samp.discrete/eval.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.samp/rand.dist.samp.pconst/eval.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.samp/rand.dist.samp.plinear/eval.pass.cpp libcxx/test/std/numerics/rand/rand.dist/rand.dist.samp/rand.dist.samp.plinear/eval_param.pass.cpp
``````````
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/libcxx/test/std/numerics/rand/rand.dist/rand.dist.norm/rand.dist.norm.cauchy/eval.pass.cpp b/libcxx/test/std/numerics/rand/rand.dist/rand.dist.norm/rand.dist.norm.cauchy/eval.pass.cpp
index 98f32d00f8..83e64046f0 100644
--- a/libcxx/test/std/numerics/rand/rand.dist/rand.dist.norm/rand.dist.norm.cauchy/eval.pass.cpp
+++ b/libcxx/test/std/numerics/rand/rand.dist/rand.dist.norm/rand.dist.norm.cauchy/eval.pass.cpp
@@ -45,7 +45,7 @@ int main(int, char**)
u.push_back(d(g));
std::sort(u.begin(), u.end());
for (int i = 0; i < N; ++i)
- assert(std::abs(f(u[i], a, b) - double(i)/N) < .0013);
+ assert(std::abs(f(u[i], a, b) - double(i) / N) < .0013);
}
{
typedef std::cauchy_distribution<> D;
@@ -60,7 +60,7 @@ int main(int, char**)
u.push_back(d(g));
std::sort(u.begin(), u.end());
for (int i = 0; i < N; ++i)
- assert(std::abs(f(u[i], a, b) - double(i)/N) < .0013);
+ assert(std::abs(f(u[i], a, b) - double(i) / N) < .0013);
}
{
typedef std::cauchy_distribution<> D;
@@ -75,7 +75,7 @@ int main(int, char**)
u.push_back(d(g));
std::sort(u.begin(), u.end());
for (int i = 0; i < N; ++i)
- assert(std::abs(f(u[i], a, b) - double(i)/N) < .0013);
+ assert(std::abs(f(u[i], a, b) - double(i) / N) < .0013);
}
return 0;
diff --git a/libcxx/test/std/numerics/rand/rand.dist/rand.dist.samp/rand.dist.samp.discrete/eval.pass.cpp b/libcxx/test/std/numerics/rand/rand.dist/rand.dist.samp/rand.dist.samp.discrete/eval.pass.cpp
index 3830a1840a..9c6365e7e2 100644
--- a/libcxx/test/std/numerics/rand/rand.dist/rand.dist.samp/rand.dist.samp.discrete/eval.pass.cpp
+++ b/libcxx/test/std/numerics/rand/rand.dist/rand.dist.samp/rand.dist.samp.discrete/eval.pass.cpp
@@ -81,7 +81,7 @@ void tests() {
}
std::vector<double> prob = d.probabilities();
for (unsigned i = 0; i < u.size(); ++i)
- assert(std::abs((double)u[i]/N - prob[i]) / prob[i] < 0.0013);
+ assert(std::abs((double)u[i] / N - prob[i]) / prob[i] < 0.0013);
}
{
typedef std::discrete_distribution<T> D;
@@ -158,7 +158,7 @@ void tests() {
std::vector<double> prob = d.probabilities();
for (unsigned i = 0; i < u.size(); ++i)
if (prob[i] != 0)
- assert(std::abs((double)u[i]/N - prob[i]) / prob[i] < 0.0013);
+ assert(std::abs((double)u[i] / N - prob[i]) / prob[i] < 0.0013);
else
assert(u[i] == 0);
}
@@ -202,7 +202,7 @@ void tests() {
std::vector<double> prob = d.probabilities();
for (unsigned i = 0; i < u.size(); ++i)
if (prob[i] != 0)
- assert(std::abs((double)u[i]/N - prob[i]) / prob[i] < 0.0013);
+ assert(std::abs((double)u[i] / N - prob[i]) / prob[i] < 0.0013);
else
assert(u[i] == 0);
}
@@ -290,7 +290,7 @@ void tests() {
std::vector<double> prob = d.probabilities();
for (unsigned i = 0; i < u.size(); ++i)
if (prob[i] != 0)
- assert(std::abs((double)u[i]/N - prob[i]) / prob[i] < 0.0013);
+ assert(std::abs((double)u[i] / N - prob[i]) / prob[i] < 0.0013);
else
assert(u[i] == 0);
}
diff --git a/libcxx/test/std/numerics/rand/rand.dist/rand.dist.samp/rand.dist.samp.plinear/eval.pass.cpp b/libcxx/test/std/numerics/rand/rand.dist/rand.dist.samp/rand.dist.samp.plinear/eval.pass.cpp
index 81a6b73006..3d172a4d1c 100644
--- a/libcxx/test/std/numerics/rand/rand.dist/rand.dist.samp/rand.dist.samp.plinear/eval.pass.cpp
+++ b/libcxx/test/std/numerics/rand/rand.dist/rand.dist.samp/rand.dist.samp.plinear/eval.pass.cpp
@@ -76,18 +76,17 @@ test1()
p[i] /= S;
for (std::size_t i = 0; i < N; ++i)
{
- std::ptrdiff_t k = std::lower_bound(b, b+Np+1, u[i]) - b - 1;
- if (k != kp)
- {
- a = 0;
- for (int j = 0; j < k; ++j)
- a += areas[j];
- m = (p[k+1] - p[k]) / (b[k+1] - b[k]);
- bk = b[k];
- c = (b[k+1]*p[k] - b[k]*p[k+1]) / (b[k+1] - b[k]);
- kp = k;
+ std::ptrdiff_t k = std::lower_bound(b, b + Np + 1, u[i]) - b - 1;
+ if (k != kp) {
+ a = 0;
+ for (int j = 0; j < k; ++j)
+ a += areas[j];
+ m = (p[k + 1] - p[k]) / (b[k + 1] - b[k]);
+ bk = b[k];
+ c = (b[k + 1] * p[k] - b[k] * p[k + 1]) / (b[k + 1] - b[k]);
+ kp = k;
}
- assert(std::abs(f(u[i], a, m, bk, c) - double(i)/N) < .0013);
+ assert(std::abs(f(u[i], a, m, bk, c) - double(i) / N) < .0013);
}
}
@@ -128,18 +127,17 @@ test2()
p[i] /= S;
for (std::size_t i = 0; i < N; ++i)
{
- std::ptrdiff_t k = std::lower_bound(b, b+Np+1, u[i]) - b - 1;
- if (k != kp)
- {
- a = 0;
- for (int j = 0; j < k; ++j)
- a += areas[j];
- m = (p[k+1] - p[k]) / (b[k+1] - b[k]);
- bk = b[k];
- c = (b[k+1]*p[k] - b[k]*p[k+1]) / (b[k+1] - b[k]);
- kp = k;
+ std::ptrdiff_t k = std::lower_bound(b, b + Np + 1, u[i]) - b - 1;
+ if (k != kp) {
+ a = 0;
+ for (int j = 0; j < k; ++j)
+ a += areas[j];
+ m = (p[k + 1] - p[k]) / (b[k + 1] - b[k]);
+ bk = b[k];
+ c = (b[k + 1] * p[k] - b[k] * p[k + 1]) / (b[k + 1] - b[k]);
+ kp = k;
}
- assert(std::abs(f(u[i], a, m, bk, c) - double(i)/N) < .0013);
+ assert(std::abs(f(u[i], a, m, bk, c) - double(i) / N) < .0013);
}
}
@@ -180,18 +178,17 @@ test3()
p[i] /= S;
for (std::size_t i = 0; i < N; ++i)
{
- std::ptrdiff_t k = std::lower_bound(b, b+Np+1, u[i]) - b - 1;
- if (k != kp)
- {
- a = 0;
- for (int j = 0; j < k; ++j)
- a += areas[j];
- m = (p[k+1] - p[k]) / (b[k+1] - b[k]);
- bk = b[k];
- c = (b[k+1]*p[k] - b[k]*p[k+1]) / (b[k+1] - b[k]);
- kp = k;
+ std::ptrdiff_t k = std::lower_bound(b, b + Np + 1, u[i]) - b - 1;
+ if (k != kp) {
+ a = 0;
+ for (int j = 0; j < k; ++j)
+ a += areas[j];
+ m = (p[k + 1] - p[k]) / (b[k + 1] - b[k]);
+ bk = b[k];
+ c = (b[k + 1] * p[k] - b[k] * p[k + 1]) / (b[k + 1] - b[k]);
+ kp = k;
}
- assert(std::abs(f(u[i], a, m, bk, c) - double(i)/N) < .0013);
+ assert(std::abs(f(u[i], a, m, bk, c) - double(i) / N) < .0013);
}
}
@@ -232,19 +229,18 @@ test4()
p[i] /= S;
for (std::size_t i = 0; i < N; ++i)
{
- std::ptrdiff_t k = std::lower_bound(b, b+Np+1, u[i]) - b - 1;
- if (k != kp)
- {
- a = 0;
- for (int j = 0; j < k; ++j)
- a += areas[j];
- assert(k < static_cast<int>(Np));
- m = (p[k+1] - p[k]) / (b[k+1] - b[k]);
- bk = b[k];
- c = (b[k+1]*p[k] - b[k]*p[k+1]) / (b[k+1] - b[k]);
- kp = k;
+ std::ptrdiff_t k = std::lower_bound(b, b + Np + 1, u[i]) - b - 1;
+ if (k != kp) {
+ a = 0;
+ for (int j = 0; j < k; ++j)
+ a += areas[j];
+ assert(k < static_cast<int>(Np));
+ m = (p[k + 1] - p[k]) / (b[k + 1] - b[k]);
+ bk = b[k];
+ c = (b[k + 1] * p[k] - b[k] * p[k + 1]) / (b[k + 1] - b[k]);
+ kp = k;
}
- assert(std::abs(f(u[i], a, m, bk, c) - double(i)/N) < .0013);
+ assert(std::abs(f(u[i], a, m, bk, c) - double(i) / N) < .0013);
}
}
@@ -286,19 +282,18 @@ test5()
p[i] /= S;
for (std::size_t i = 0; i < N; ++i)
{
- std::ptrdiff_t k = std::lower_bound(b, b+Np+1, u[i]) - b - 1;
- if (k != kp)
- {
- a = 0;
- for (int j = 0; j < k; ++j)
- a += areas[j];
- assert(k < static_cast<int>(Np));
- m = (p[k+1] - p[k]) / (b[k+1] - b[k]);
- bk = b[k];
- c = (b[k+1]*p[k] - b[k]*p[k+1]) / (b[k+1] - b[k]);
- kp = k;
+ std::ptrdiff_t k = std::lower_bound(b, b + Np + 1, u[i]) - b - 1;
+ if (k != kp) {
+ a = 0;
+ for (int j = 0; j < k; ++j)
+ a += areas[j];
+ assert(k < static_cast<int>(Np));
+ m = (p[k + 1] - p[k]) / (b[k + 1] - b[k]);
+ bk = b[k];
+ c = (b[k + 1] * p[k] - b[k] * p[k + 1]) / (b[k + 1] - b[k]);
+ kp = k;
}
- assert(std::abs(f(u[i], a, m, bk, c) - double(i)/N) < .0013);
+ assert(std::abs(f(u[i], a, m, bk, c) - double(i) / N) < .0013);
}
}
@@ -339,18 +334,17 @@ test6()
p[i] /= S;
for (std::size_t i = 0; i < N; ++i)
{
- std::ptrdiff_t k = std::lower_bound(b, b+Np+1, u[i]) - b - 1;
- if (k != kp)
- {
- a = 0;
- for (int j = 0; j < k; ++j)
- a += areas[j];
- m = (p[k+1] - p[k]) / (b[k+1] - b[k]);
- bk = b[k];
- c = (b[k+1]*p[k] - b[k]*p[k+1]) / (b[k+1] - b[k]);
- kp = k;
+ std::ptrdiff_t k = std::lower_bound(b, b + Np + 1, u[i]) - b - 1;
+ if (k != kp) {
+ a = 0;
+ for (int j = 0; j < k; ++j)
+ a += areas[j];
+ m = (p[k + 1] - p[k]) / (b[k + 1] - b[k]);
+ bk = b[k];
+ c = (b[k + 1] * p[k] - b[k] * p[k + 1]) / (b[k + 1] - b[k]);
+ kp = k;
}
- assert(std::abs(f(u[i], a, m, bk, c) - double(i)/N) < .0013);
+ assert(std::abs(f(u[i], a, m, bk, c) - double(i) / N) < .0013);
}
}
diff --git a/libcxx/test/std/numerics/rand/rand.dist/rand.dist.samp/rand.dist.samp.plinear/eval_param.pass.cpp b/libcxx/test/std/numerics/rand/rand.dist/rand.dist.samp/rand.dist.samp.plinear/eval_param.pass.cpp
index c3a1cd5f36..14c8fec078 100644
--- a/libcxx/test/std/numerics/rand/rand.dist/rand.dist.samp/rand.dist.samp.plinear/eval_param.pass.cpp
+++ b/libcxx/test/std/numerics/rand/rand.dist/rand.dist.samp/rand.dist.samp.plinear/eval_param.pass.cpp
@@ -78,18 +78,17 @@ int main(int, char**)
p[i] /= S;
for (std::size_t i = 0; i < N; ++i)
{
- std::ptrdiff_t k = std::lower_bound(b, b+Np+1, u[i]) - b - 1;
- if (k != kp)
- {
- a = 0;
- for (int j = 0; j < k; ++j)
- a += areas[j];
- m = (p[k+1] - p[k]) / (b[k+1] - b[k]);
- bk = b[k];
- c = (b[k+1]*p[k] - b[k]*p[k+1]) / (b[k+1] - b[k]);
- kp = k;
+ std::ptrdiff_t k = std::lower_bound(b, b + Np + 1, u[i]) - b - 1;
+ if (k != kp) {
+ a = 0;
+ for (int j = 0; j < k; ++j)
+ a += areas[j];
+ m = (p[k + 1] - p[k]) / (b[k + 1] - b[k]);
+ bk = b[k];
+ c = (b[k + 1] * p[k] - b[k] * p[k + 1]) / (b[k + 1] - b[k]);
+ kp = k;
}
- assert(std::abs(f(u[i], a, m, bk, c) - double(i)/N) < .0013);
+ assert(std::abs(f(u[i], a, m, bk, c) - double(i) / N) < .0013);
}
}
``````````
</details>
https://github.com/llvm/llvm-project/pull/88669
More information about the libcxx-commits
mailing list