X-Git-Url: https://ruin.nu/git/%3CTMPL_VAR%20NAME=PAGE%3E?a=blobdiff_plain;f=src%2Ftest%2Fcomponenttreetest.cpp;h=61e932218257ae9d7fe75a8b891fec21e43dfc0c;hb=a16f3a90b540c9adf29050f8041baf0c0781c20a;hp=222d2d76a7a3c63b74c7af5bd8900d16cdb146ee;hpb=6ba92ada02bfbb04abb8a0c7a039ec63c7c9921e;p=germs.git

diff --git a/src/test/componenttreetest.cpp b/src/test/componenttreetest.cpp
index 222d2d7..61e9322 100644
--- a/src/test/componenttreetest.cpp
+++ b/src/test/componenttreetest.cpp
@@ -23,6 +23,9 @@ class TESTNAME : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( TESTNAME );
   CPPUNIT_TEST( testCreate );
+  CPPUNIT_TEST( testMakeUnoriented );
+  CPPUNIT_TEST( testCountLeaves );
+  CPPUNIT_TEST( testShortBranches );
   CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -60,7 +63,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 +80,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));
@@ -97,6 +100,63 @@ protected:
 
 	}
 
+	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());
+	}
+	void testShortBranches (){
+		GeneOrder go(_validPerm.begin(),_validPerm.end());
+		ComponentTree t(findComponents(go));
+		t.makeUnoriented();
+
+		CPPUNIT_ASSERT_EQUAL((size_t)0u,t.shortBranches());
+
+		GeneOrder go2(_validPerm4.begin(),_validPerm4.end());
+		ComponentTree t2(findComponents(go2));
+		t2.makeUnoriented();
+		ComponentTree::Node* n = t2._root;
+		//CPPUNIT_ASSERT_EQUAL((size_t)1u,t2.shortBranches());
+	}
+
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION( TESTNAME );