X-Git-Url: https://ruin.nu/git/?p=germs.git;a=blobdiff_plain;f=src%2Ftest%2Fgenealgorithmstest.cpp;h=35f3bf8bca3010d8d3c73254e5c86e0b5f32d7a5;hp=b7dd4e16862e9452751ff509c41b1347f1052536;hb=7e811915a713eeef44f03385a1fc1f74a5301c30;hpb=e81855989d0f0e124e0ec770b417bcb099959391

diff --git a/src/test/genealgorithmstest.cpp b/src/test/genealgorithmstest.cpp
index b7dd4e1..35f3bf8 100644
--- a/src/test/genealgorithmstest.cpp
+++ b/src/test/genealgorithmstest.cpp
@@ -84,22 +84,40 @@ protected:
 	}
 	void testFindIntervals (){
 		GeneOrder go(_validPerm.begin(),_validPerm.end());
-		vector<pair<size_t,size_t> > v = findIntervals(go);
+		vector<Interval> 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(_validPerm3.begin(),_validPerm3.end());
+		GeneOrder go2(_validPerm2.begin(),_validPerm2.end());
+		v = findIntervals(go2);
+		CPPUNIT_ASSERT_EQUAL(9ul,v.size());
+		Interval go20(1,3,true);
+		Interval go21(2,2);
+		Interval go22(1,4,true);
+		Interval go23(5,3);
+		Interval go25(6,7);
+		Interval go26(8,8);
+		Interval go27(9,7,true);
+		CPPUNIT_ASSERT(go20 == v[0]);
+		CPPUNIT_ASSERT(go21 == v[1]);
+		CPPUNIT_ASSERT(go22 == v[2]);
+		CPPUNIT_ASSERT(go23 == v[3]);
+		CPPUNIT_ASSERT(go25 == v[5]);
+		CPPUNIT_ASSERT(go26 == v[6]);
+		CPPUNIT_ASSERT(go27 == v[7]);
+
+		/*GeneOrder go2(_validPerm3.begin(),_validPerm3.end());
 		v = findIntervals(go2);
 		CPPUNIT_ASSERT_EQUAL(16ul,v.size());
-		Interval go20(1,2);
+		Interval go20(1,2,true);
 		Interval go22(4,2);
 		Interval go215(8,16);
 		CPPUNIT_ASSERT(go20 == v[0]);
 		CPPUNIT_ASSERT(go22 == v[2]);
-		CPPUNIT_ASSERT(go215 == v[15]);
+		CPPUNIT_ASSERT(go215 == v[15]);*/
 	}
 	void testFindIntervalsAtPoints (){
 		GeneOrder go(_validPerm.begin(),_validPerm.end());