adding countCycles, findComponents, findIntervals declaration, with initial tests

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

diff --git a/src/test/genealgorithmstest.cpp b/src/test/genealgorithmstest.cpp
index 55ebb58db7085ff5cbeb242d7ce7b3057d97659c..50a5c736c1903ac2bd6d8a7941cccfec715353d4 100644 (file)
--- a/src/test/genealgorithmstest.cpp
+++ b/src/test/genealgorithmstest.cpp
@@ -22,6 +22,8 @@ class TESTNAME : public CPPUNIT_NS::TestFixture
   CPPUNIT_TEST_SUITE( TESTNAME );
   CPPUNIT_TEST( testRobinsonSchensted );
   CPPUNIT_TEST( testLongestSequences );
+  CPPUNIT_TEST( testFindIntervals );
+  CPPUNIT_TEST( testCountCycles );
   CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -74,11 +76,35 @@ protected:
                
                GeneOrder go2(_validPerm2.begin(),_validPerm2.end());
                p = longestSequences(go2);
-               int first[] = {0,1,3,5,6,7,9};
-               int second[] = {2,4,8};
                CPPUNIT_ASSERT_EQUAL(7,p.first);
                CPPUNIT_ASSERT_EQUAL(2,p.second);
        }
+       void testFindIntervals (){
+               GeneOrder go(_validPerm.begin(),_validPerm.end());
+               vector<pair<size_t,size_t> > v = findIntervals(go);
+               CPPUNIT_ASSERT_EQUAL(4ul,v.size());
+               Interval go10(1,1);
+               Interval go12(3,3);
+               CPPUNIT_ASSERT(go10 == v[0]);
+               CPPUNIT_ASSERT(go12 == v[2]);
+               
+               GeneOrder go2(_validPerm2.begin(),_validPerm2.end());
+               v = findIntervals(go);
+               CPPUNIT_ASSERT_EQUAL(9ul,v.size());
+               Interval go20(1,3);
+               Interval go22(1,4);
+               CPPUNIT_ASSERT(go20 == v[0]);
+               CPPUNIT_ASSERT(go22 == v[2]);
+       }
+       void testCountCycles (){
+               GeneOrder go(_validPerm.begin(),_validPerm.end());
+               int c = countCycles(go);
+               CPPUNIT_ASSERT_EQUAL(4,c);
+               
+               GeneOrder go2(_validPerm3.begin(),_validPerm3.end());
+               c = countCycles(go2);
+               CPPUNIT_ASSERT_EQUAL(6,c);
+       }
 
 };