X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;ds=inline;f=src%2Ftest%2Fgenealgorithmstest.cpp;h=b06f416922797087cb7cca7bc4ab9589421d3395;hb=172455c7649ea714eb13f9ac1fd96652f0617ca0;hp=0fca4d2dc032a4e7e7743c76cdcad7cc69419bff;hpb=65f449adad91a229757c0317c27ad9fb87a4d222;p=germs.git

diff --git a/src/test/genealgorithmstest.cpp b/src/test/genealgorithmstest.cpp
index 0fca4d2..b06f416 100644
--- a/src/test/genealgorithmstest.cpp
+++ b/src/test/genealgorithmstest.cpp
@@ -24,7 +24,7 @@ class TESTNAME : public CPPUNIT_NS::TestFixture
   CPPUNIT_TEST( testLongestSequences );
   CPPUNIT_TEST( testFindIntervals );
   CPPUNIT_TEST( testFindIntervalsAtPoints );
-  //CPPUNIT_TEST( testCountCycles );
+  CPPUNIT_TEST( testCountCycles );
   CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -101,20 +101,20 @@ protected:
 		GeneOrder go(_validPerm.begin(),_validPerm.end());
 		vector<Interval> v = findIntervals(go);
 		v = findIntervalsAtPoints(v);
-		CPPUNIT_ASSERT_EQUAL(4ul,v.size());
+		CPPUNIT_ASSERT_EQUAL(5ul,v.size());
 		Interval go10(0,0);
 		Interval go12(2,2);
-		CPPUNIT_ASSERT(go10 == v[0]);
-		CPPUNIT_ASSERT(go12 == v[2]);
+		CPPUNIT_ASSERT(go10 == v[1]);
+		CPPUNIT_ASSERT(go12 == v[3]);
 		
 		GeneOrder go2(_validPerm3.begin(),_validPerm3.end());
 		v = findIntervals(go2);
 		v = findIntervalsAtPoints(v);
-		CPPUNIT_ASSERT_EQUAL(16ul,v.size());
+		CPPUNIT_ASSERT_EQUAL(17ul,v.size());
 		Interval go20(0,3);
 		Interval go22(1,1);
-		CPPUNIT_ASSERT(go20 == v[0]);
-		CPPUNIT_ASSERT(go22 == v[2]);
+		CPPUNIT_ASSERT(go20 == v[1]);
+		CPPUNIT_ASSERT(go22 == v[3]);
 	}
 	void testCountCycles (){
 		GeneOrder go(_validPerm.begin(),_validPerm.end());