From d7ad69b6cb31b1b38c689ac2712e78bfd19b2fb8 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sat, 10 Mar 2012 23:20:37 +0100
Subject: [PATCH] Use std::abs; Fix resulting assertion failures
---
dune/tectonic/myblockproblem.hh | 2 +-
src/one-body-sample.cc | 22 ++++++++++++----------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/dune/tectonic/myblockproblem.hh b/dune/tectonic/myblockproblem.hh
index 352fdb0c..e3fae3ff 100644
--- a/dune/tectonic/myblockproblem.hh
+++ b/dune/tectonic/myblockproblem.hh
@@ -132,7 +132,7 @@ template <class MyConvexProblemTypeTEMPLATE> class MyBlockProblem {
psi.subDiff(0, D);
if (D[1] > 0) {
// NOTE: Numerical instability can actually get us here
- assert(abs(D[1]) < 1e-15);
+ assert(std::abs(D[1]) < 1e-15);
return 0;
}
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index e6caf46a..c5b4f748 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -476,13 +476,15 @@ int main(int argc, char *argv[]) {
double ret1 =
compute_state_update_bisection(h, unorm, L, s4_old[i][0]);
- assert(abs(1.0 / h * ret1 - (s4_old[i] - unorm / L) / h -
- exp(-ret1)) < 1e-12);
+ assert(std::abs(1.0 / h * ret1 - (s4_old[i] - unorm / L) / h -
+ exp(-ret1)) < 1e-11);
+
double ret2 =
compute_state_update_lambert(h, unorm, L, s4_old[i][0]);
- assert(abs(1.0 / h * ret2 - (s4_old[i] - unorm / L) / h -
- exp(-ret2)) < 1e-12);
- assert(abs(ret2 - ret1) < 1e-14);
+ assert(std::abs(1.0 / h * ret2 - (s4_old[i] - unorm / L) / h -
+ exp(-ret2)) < 1e-11);
+
+ assert(std::abs(ret2 - ret1) < 1e-14);
(*s4_new)[i][0] = ret1;
}
@@ -540,13 +542,13 @@ int main(int argc, char *argv[]) {
double ret1 =
compute_state_update_bisection(h, unorm, L, s5_old[i][0]);
- assert(abs(1.0 / h * ret1 - (s5_old[i] - unorm / L) / h -
- exp(-ret1)) < 1e-12);
+ assert(std::abs(1.0 / h * ret1 - (s5_old[i] - unorm / L) / h -
+ exp(-ret1)) < 1e-12);
double ret2 =
compute_state_update_lambert(h, unorm, L, s5_old[i][0]);
- assert(abs(1.0 / h * ret2 - (s5_old[i] - unorm / L) / h -
- exp(-ret2)) < 1e-12);
- assert(abs(ret2 - ret1) < 1e-14);
+ assert(std::abs(1.0 / h * ret2 - (s5_old[i] - unorm / L) / h -
+ exp(-ret2)) < 1e-12);
+ assert(std::abs(ret2 - ret1) < 1e-14);
(*s5_new)[i][0] = ret1;
}
--
GitLab