From fd12c0af3e0d16b3219be1195c063fe2981ae0bd Mon Sep 17 00:00:00 2001 From: vbd Date: Mon, 10 Sep 2007 13:20:24 +0000 Subject: [PATCH] staffan : * test update --- src/INTERP_KERNEL/Test/Interpolation3DTest.hxx | 8 ++++---- src/INTERP_KERNEL/Test/Makefile.in | 4 ++-- src/INTERP_KERNEL/TransformedTriangle.hxx | 5 ----- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/INTERP_KERNEL/Test/Interpolation3DTest.hxx b/src/INTERP_KERNEL/Test/Interpolation3DTest.hxx index b52bb16c4..b5350a315 100644 --- a/src/INTERP_KERNEL/Test/Interpolation3DTest.hxx +++ b/src/INTERP_KERNEL/Test/Interpolation3DTest.hxx @@ -14,7 +14,7 @@ class Interpolation3DTest : public CppUnit::TestFixture // single - element CPPUNIT_TEST_SUITE( Interpolation3DTest ); -#if 0 + CPPUNIT_TEST( tetraReflexiveUnit ); CPPUNIT_TEST( tetraReflexiveGeneral ); @@ -47,15 +47,15 @@ class Interpolation3DTest : public CppUnit::TestFixture CPPUNIT_TEST( boxReflexiveModerate ); CPPUNIT_TEST( tetraBoxes ); CPPUNIT_TEST( moderateBoxes ); -#endif + CPPUNIT_TEST( moderateBoxesSmaller ); CPPUNIT_TEST( moderateBoxSmallReflexive ); -#if 0 + CPPUNIT_TEST( moderateBoxEvenSmallerReflexive ); CPPUNIT_TEST( tinyBoxReflexive ); CPPUNIT_TEST( simpleHexaBox ); -#endif + CPPUNIT_TEST_SUITE_END(); diff --git a/src/INTERP_KERNEL/Test/Makefile.in b/src/INTERP_KERNEL/Test/Makefile.in index c3fdbfae9..8d235922d 100644 --- a/src/INTERP_KERNEL/Test/Makefile.in +++ b/src/INTERP_KERNEL/Test/Makefile.in @@ -69,8 +69,8 @@ CXXFLAGS+= -I/usr/include/cppunit CPPFLAGS+= -I/usr/include/cppunit # for log -CXXFLAGS+= -DLOG_LEVEL=3 #-DOPTIMIZE -O2 -CPPFLAGS+= -DLOG_LEVEL=3 #-DOPTIMIZE -O2 +CXXFLAGS+= -DLOG_LEVEL=3 -DOPTIMIZE -O2 +CPPFLAGS+= -DLOG_LEVEL=3 -DOPTIMIZE -O2 # for gcov #CXXFLAGS+=-fprofile-arcs -ftest-coverage diff --git a/src/INTERP_KERNEL/TransformedTriangle.hxx b/src/INTERP_KERNEL/TransformedTriangle.hxx index df91c099d..73c5a8ead 100644 --- a/src/INTERP_KERNEL/TransformedTriangle.hxx +++ b/src/INTERP_KERNEL/TransformedTriangle.hxx @@ -22,7 +22,6 @@ class TransformedTriangleTest; class TransformedTriangleIntersectTest; - namespace INTERP_UTILS { @@ -120,10 +119,6 @@ namespace INTERP_UTILS private: - //////////////////////////////////////////////////////////////////////////////////// - /// High-level methods called directly by calculateIntersectionVolume() //////// - //////////////////////////////////////////////////////////////////////////////////// - void calculateIntersectionPolygons(); void calculatePolygonBarycenter(const IntersectionPolygon poly, double* barycenter); -- 2.39.2