Changeset c739b3 for src/Fragmentation/Summation/SetValues/unittests/SamplingGridPropertiesUnitTest.cpp

Timestamp:

Jun 8, 2016, 10:45:27 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Children:

6369bc

Parents:

e34888

git-author:

Frederik Heber <heber@…> (06/06/16 14:28:05)

git-committer:

Frederik Heber <heber@…> (06/08/16 22:45:27)

Message:

Extended SamplingGridProperties::isCompatible() to allow more finely resolved grids, added ::isEquivalent().

• isEquivalent contains the old check and we replaced isCompatible() by it.

File:

• src/Fragmentation/Summation/SetValues/unittests/SamplingGridPropertiesUnitTest.cpp (modified) (2 diffs)

src/Fragmentation/Summation/SetValues/unittests/SamplingGridPropertiesUnitTest.cpp

@@ -75 +75 @@
 }
 
-/** UnitTest for isCompatible()
+/** UnitTest for isEquivalent()
  */
-void SamplingGridPropertiesTest::isCompatible_Test()
+void SamplingGridPropertiesTest::isEquivalent_Test()
 {
   const double begin[3] = { 0., 0., 0. };
@@ -91 +91 @@
 
   // only checks for same level
+  CPPUNIT_ASSERT( props->isEquivalent(*props) );
+  CPPUNIT_ASSERT( props->isEquivalent(sameprops) );
+  CPPUNIT_ASSERT( sameprops.isEquivalent(*props) );
+  CPPUNIT_ASSERT( !props->isEquivalent(otherprops) );
+  CPPUNIT_ASSERT( !otherprops.isEquivalent(*props) );
+  CPPUNIT_ASSERT( !props->isEquivalent(anotherprops) );
+  CPPUNIT_ASSERT( !anotherprops.isEquivalent(*props) );
+  CPPUNIT_ASSERT( !props->isEquivalent(moreotherprops) );
+  CPPUNIT_ASSERT( !moreotherprops.isEquivalent(*props) );
+}
+
+/** UnitTest for isCompatible()
+ */
+void SamplingGridPropertiesTest::isCompatible_Test()
+{
+  const double begin[3] = { 0., 0., 0. };
+  const double otherbegin[3] = { .5, .5, .5 };
+  const double end[3] = { 1., 1., 1. };
+  const double otherend[3] = { 2., 2., 2. };
+
+  // create other props
+  SamplingGridProperties sameprops(begin, end, 2); // same
+  SamplingGridProperties secondhalf(otherbegin, end, 2); // second half
+  SamplingGridProperties goingbeyond(begin, otherend, 2); // going beyond
+  SamplingGridProperties finerlevel(begin, end, 4); // same but different level
+
+  // only checks for same level
   CPPUNIT_ASSERT( props->isCompatible(*props) );
   CPPUNIT_ASSERT( props->isCompatible(sameprops) );
   CPPUNIT_ASSERT( sameprops.isCompatible(*props) );
-  CPPUNIT_ASSERT( props->isCompatible(otherprops) );
-  CPPUNIT_ASSERT( otherprops.isCompatible(*props) );
-  CPPUNIT_ASSERT( props->isCompatible(anotherprops) );
-  CPPUNIT_ASSERT( anotherprops.isCompatible(*props) );
-  CPPUNIT_ASSERT( !props->isCompatible(moreotherprops) );
-  CPPUNIT_ASSERT( !moreotherprops.isCompatible(*props) );
+  CPPUNIT_ASSERT( props->isCompatible(secondhalf) );
+  CPPUNIT_ASSERT( !secondhalf.isCompatible(*props) );
+  CPPUNIT_ASSERT( !props->isCompatible(goingbeyond) );
+  CPPUNIT_ASSERT( goingbeyond.isCompatible(*props) );
+  CPPUNIT_ASSERT( props->isCompatible(finerlevel) );
+  CPPUNIT_ASSERT( !finerlevel.isCompatible(*props) );
 }