findIntervalAtPoints implemnted and passes test

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

diff --git a/src/test/genealgorithmstest.cpp b/src/test/genealgorithmstest.cpp
index 2b9ae79bfc89dbac994081a753ddc04feb6d0b37..0fca4d2dc032a4e7e7743c76cdcad7cc69419bff 100644 (file)
--- a/src/test/genealgorithmstest.cpp
+++ b/src/test/genealgorithmstest.cpp
@@ -23,7 +23,8 @@ class TESTNAME : public CPPUNIT_NS::TestFixture
   CPPUNIT_TEST( testRobinsonSchensted );
   CPPUNIT_TEST( testLongestSequences );
   CPPUNIT_TEST( testFindIntervals );
-  CPPUNIT_TEST( testCountCycles );
+  CPPUNIT_TEST( testFindIntervalsAtPoints );
+  //CPPUNIT_TEST( testCountCycles );
   CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -88,11 +89,30 @@ protected:
                CPPUNIT_ASSERT(go10 == v[0]);
                CPPUNIT_ASSERT(go12 == v[2]);
                
-               GeneOrder go2(_validPerm2.begin(),_validPerm2.end());
+               GeneOrder go2(_validPerm3.begin(),_validPerm3.end());
+               v = findIntervals(go2);
+               CPPUNIT_ASSERT_EQUAL(16ul,v.size());
+               Interval go20(1,2);
+               Interval go22(4,2);
+               CPPUNIT_ASSERT(go20 == v[0]);
+               CPPUNIT_ASSERT(go22 == v[2]);
+       }
+       void testFindIntervalsAtPoints (){
+               GeneOrder go(_validPerm.begin(),_validPerm.end());
+               vector<Interval> v = findIntervals(go);
+               v = findIntervalsAtPoints(v);
+               CPPUNIT_ASSERT_EQUAL(4ul,v.size());
+               Interval go10(0,0);
+               Interval go12(2,2);
+               CPPUNIT_ASSERT(go10 == v[0]);
+               CPPUNIT_ASSERT(go12 == v[2]);
+               
+               GeneOrder go2(_validPerm3.begin(),_validPerm3.end());
                v = findIntervals(go2);
-               CPPUNIT_ASSERT_EQUAL(9ul,v.size());
-               Interval go20(1,3);
-               Interval go22(1,4);
+               v = findIntervalsAtPoints(v);
+               CPPUNIT_ASSERT_EQUAL(16ul,v.size());
+               Interval go20(0,3);
+               Interval go22(1,1);
                CPPUNIT_ASSERT(go20 == v[0]);
                CPPUNIT_ASSERT(go22 == v[2]);
        }