Changeset c739b3 for src/Fragmentation/Summation/SetValues/unittests/SamplingGridUnitTest.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/SamplingGridUnitTest.cpp (modified) (2 diffs)

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

@@ -89 +89 @@
 }
 
-/** UnitTest on compatible combination of props and values
- */
-void SamplingGridTest::compatibleGrids_Test()
+/** UnitTest on equivalent combination of props and values
+ */
+void SamplingGridTest::equivalentGrids_Test()
 {
   // check illegal grid
   const double begin[NDIM] = { 0., 0., 0. };
-  const double end[NDIM] = { 2., 2., 2. };
+  const double end[NDIM] = { 1., 1., 1. };
   SamplingGridProperties illegal_props(begin, end, 5);
   SamplingGridProperties legal_props(begin, end, 2);
+  CPPUNIT_ASSERT( !grid->isEquivalent(illegal_props) );
+  CPPUNIT_ASSERT( grid->isEquivalent(legal_props) );
+  SamplingGrid::sampledvalues_t illegal_values;
+  for (size_t i=0; i< NUMBEROFSAMPLES(1); ++i)
+    illegal_values += 1.5;
+  SamplingGrid::sampledvalues_t legal_values;
+  for (size_t i=0; i< NUMBEROFSAMPLES(2); ++i)
+    legal_values += 1.5;
+#ifndef NDEBUG
+  // throws because props and size of illegal_values don't match
+  std::cout << "The following assertion is intended and does not indicate a failure of the test." << std::endl;
+  CPPUNIT_ASSERT_THROW( SamplingGrid illegal_grid(illegal_props, illegal_values), Assert::AssertionFailure );
+  std::cout << "The following assertion is intended and does not indicate a failure of the test." << std::endl;
+  CPPUNIT_ASSERT_THROW( SamplingGrid illegal_grid(legal_props, illegal_values), Assert::AssertionFailure );
+  std::cout << "The following assertion is intended and does not indicate a failure of the test." << std::endl;
+  CPPUNIT_ASSERT_THROW( SamplingGrid illegal_grid(illegal_props, legal_values), Assert::AssertionFailure );
+#endif
+  // check that grid is still the same
+  for (SamplingGrid::sampledvalues_t::const_iterator iter = grid->sampled_grid.begin();
+      iter != grid->sampled_grid.end(); ++iter)
+    CPPUNIT_ASSERT_EQUAL( grid_value, *iter );
+}
+
+/** UnitTest on compatible combination of props and values
+ */
+void SamplingGridTest::compatibleGrids_Test()
+{
+  // check illegal grid
+  const double begin[NDIM] = { 0., 0., 0. };
+  const double end[NDIM] = { 1., 1., 1. };
+  const double otherend[NDIM] = { 2.5, 2.5, 2.5 };
+  SamplingGridProperties illegal_props(begin, otherend, 5);
+  SamplingGridProperties legal_props(begin, end, 3);
   CPPUNIT_ASSERT( !grid->isCompatible(illegal_props) );
   CPPUNIT_ASSERT( grid->isCompatible(legal_props) );
@@ -143 +176 @@
   SamplingGrid default_grid(legal_props);
   // note that we always construct a temporary SamplingGrid from given props
-  CPPUNIT_ASSERT( default_grid.isCompatible(illegal_begin_props) == default_grid.isCongruent(illegal_begin_props));
-  CPPUNIT_ASSERT( default_grid.isCompatible(illegal_end_props) == default_grid.isCongruent(illegal_end_props));
-  CPPUNIT_ASSERT( default_grid.isCompatible(illegal_level_props) == default_grid.isCongruent(illegal_level_props));
-  CPPUNIT_ASSERT( default_grid.isCompatible(legal_props) == default_grid.isCongruent(legal_props) );
+  CPPUNIT_ASSERT( default_grid.isEquivalent(illegal_begin_props) == default_grid.isCongruent(illegal_begin_props));
+  CPPUNIT_ASSERT( default_grid.isEquivalent(illegal_end_props) == default_grid.isCongruent(illegal_end_props));
+  CPPUNIT_ASSERT( default_grid.isEquivalent(illegal_level_props) == default_grid.isCongruent(illegal_level_props));
+  CPPUNIT_ASSERT( default_grid.isEquivalent(legal_props) == default_grid.isCongruent(legal_props) );
 
   default_grid.setWindowSize(begin, end);