From 56e1e5724dcd18e3784d808fa6b4a6d274e6ea0a Mon Sep 17 00:00:00 2001
From: stefan <stefan@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Thu, 20 May 2010 12:28:51 +0000
Subject: [PATCH] again fixes for windows unit tests (double / float precision
errors)
git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2272 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
modules/img/alg/tests/test_discrete_shrink.cc | 2 +-
modules/img/base/tests/test_image.cc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/img/alg/tests/test_discrete_shrink.cc b/modules/img/alg/tests/test_discrete_shrink.cc
index 96708a050..337a15736 100644
--- a/modules/img/alg/tests/test_discrete_shrink.cc
+++ b/modules/img/alg/tests/test_discrete_shrink.cc
@@ -53,7 +53,7 @@ void test()
h.GetReal(p2+Point(1,0))+
h.GetReal(p2+Point(0,1))+
h.GetReal(p2+Point(1,1)));
- BOOST_CHECK_CLOSE(std::fabs(sm-rh.GetReal(it)),0.0,0.000001);
+ BOOST_CHECK_SMALL(Real(std::fabs(sm-rh.GetReal(it))),Real(1e-7));
}
}
diff --git a/modules/img/base/tests/test_image.cc b/modules/img/base/tests/test_image.cc
index 8ee8161a0..dde2a034f 100644
--- a/modules/img/base/tests/test_image.cc
+++ b/modules/img/base/tests/test_image.cc
@@ -312,7 +312,7 @@ void test_ImageOps()
ImageHandle h3=h1+h2;
for(ExtentIterator it(Extent(Point(-4,-3),Point(4,5))); !it.AtEnd(); ++it) {
if(ex1.Contains(it) && ex2.Contains(it)) {
- BOOST_REQUIRE_CLOSE(std::fabs(h3.GetReal(it)-(h1.GetReal(it)+h2.GetReal(it))),0.0,0.000001);
+ BOOST_REQUIRE(check_close(std::fabs(h3.GetReal(it)-(h1.GetReal(it)+h2.GetReal(it))),Real(0.0),1e-6));
} else if (ex1.Contains(it)) {
BOOST_REQUIRE(h3.GetReal(it)==h1.GetReal(it));
} else {
@@ -324,7 +324,7 @@ void test_ImageOps()
h3=h1-h2;
for(ExtentIterator it(Extent(Point(-2,-1),Point(1,2))); !it.AtEnd(); ++it) {
if(ex1.Contains(it) && ex2.Contains(it)) {
- BOOST_REQUIRE(std::fabs(h3.GetReal(it)-(h1.GetReal(it)-h2.GetReal(it)))<1e-10);
+ BOOST_REQUIRE(check_close(std::fabs(h3.GetReal(it)-(h1.GetReal(it)-h2.GetReal(it))),Real(0.0),1e-6));
} else if (ex1.Contains(it)) {
BOOST_REQUIRE(h3.GetReal(it)==h1.GetReal(it));
} else {
--
GitLab