have all tests enabled

[germs.git] / src / test / componenttreetest.cpp

diff --git a/src/test/componenttreetest.cpp b/src/test/componenttreetest.cpp
index 3e0b5051a57c62f15ddb7552f2cfb4dbd80a473e..b916bf4139d0385a279476d74e74af1438c57aee 100644 (file)
--- a/src/test/componenttreetest.cpp
+++ b/src/test/componenttreetest.cpp
@@ -23,6 +23,8 @@ class TESTNAME : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( TESTNAME );
   CPPUNIT_TEST( testCreate );
+  CPPUNIT_TEST( testMakeUnoriented );
+  CPPUNIT_TEST( testCountLeaves );
   CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -60,7 +62,7 @@ protected:
        void testCreate (){
                GeneOrder go(_validPerm.begin(),_validPerm.end());
                ComponentTree t(findComponents(go));
-               ComponentTree::Node* n = &t._root;
+               ComponentTree::Node* n = t._root;
 
                CPPUNIT_ASSERT_EQUAL((size_t)4u,count(n));
                CPPUNIT_ASSERT_EQUAL((size_t)5u,count(n,true));
@@ -77,7 +79,7 @@ protected:
 
                GeneOrder go2(_validPerm4.begin(),_validPerm4.end());
                ComponentTree t2(findComponents(go2));
-               n = &t2._root;
+               n = t2._root;
 
                CPPUNIT_ASSERT_EQUAL((size_t)6u,count(n));
                CPPUNIT_ASSERT_EQUAL((size_t)9u,count(n,true));
@@ -91,9 +93,56 @@ protected:
                CPPUNIT_ASSERT(n->_children[0]->_comp == go21);
                CPPUNIT_ASSERT(n->_children[1]->_comp == go22);
                CPPUNIT_ASSERT(n->_children[2]->_comp == go25);
+               CPPUNIT_ASSERT(n->_children[0]->_children[0]->_children[0]->_comp == go20);
+               CPPUNIT_ASSERT(n->_children[2]->_children[0]->_children[0]->_comp == go23);
+               CPPUNIT_ASSERT(n->_children[2]->_children[0]->_children[1]->_comp == go24);
 
        }
 
+       void testMakeUnoriented (){
+               GeneOrder go(_validPerm.begin(),_validPerm.end());
+               ComponentTree t(findComponents(go));
+               t.makeUnoriented();
+               ComponentTree::Node* n = t._root;
+
+               CPPUNIT_ASSERT_EQUAL((size_t)0u,count(n));
+               CPPUNIT_ASSERT_EQUAL((size_t)1u,count(n,true));
+               CPPUNIT_ASSERT_EQUAL((size_t)0u,n->_children.size());
+
+               GeneOrder go2(_validPerm4.begin(),_validPerm4.end());
+               ComponentTree t2(findComponents(go2));
+               t2.makeUnoriented();
+               n = t2._root;
+
+               CPPUNIT_ASSERT_EQUAL((size_t)4u,count(n));
+               CPPUNIT_ASSERT_EQUAL((size_t)6u,count(n,true));
+               CPPUNIT_ASSERT_EQUAL((size_t)2u,n->_children.size());
+               Component go22(4,7,1,4,7);
+               Component go23(-15,-12,-1,8,11);
+               Component go24(-12,-9,-1,11,14);
+               Component go25(7,16,0,7,16);
+               CPPUNIT_ASSERT(n->_children[0]->_comp == go22);
+               CPPUNIT_ASSERT(n->_children[1]->_comp == go25);
+               CPPUNIT_ASSERT(n->_children[1]->_children[0]->_children[0]->_comp == go23);
+               CPPUNIT_ASSERT(n->_children[1]->_children[0]->_children[1]->_comp == go24);
+       }
+
+       void testCountLeaves (){
+               GeneOrder go(_validPerm.begin(),_validPerm.end());
+               ComponentTree t(findComponents(go));
+               t.makeUnoriented();
+
+               CPPUNIT_ASSERT_EQUAL((size_t)0u,t.countLeaves());
+
+               GeneOrder go2(_validPerm4.begin(),_validPerm4.end());
+               ComponentTree t2(findComponents(go2));
+               t2.makeUnoriented();
+               ComponentTree::Node* n = t2._root;
+               CPPUNIT_ASSERT_EQUAL((size_t)2u,n->_children.size());
+               CPPUNIT_ASSERT_EQUAL(false,n->_children.empty());
+               CPPUNIT_ASSERT_EQUAL((size_t)3u,t2.countLeaves());
+       }
+
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION( TESTNAME );