X-Git-Url: https://ruin.nu/git/?p=germs.git;a=blobdiff_plain;f=src%2Ftest%2Fgenealgorithmstest.cpp;h=2b9ae79bfc89dbac994081a753ddc04feb6d0b37;hp=55ebb58db7085ff5cbeb242d7ce7b3057d97659c;hb=6be4116d6211ac4ba4c68dc2ab28f1bc5d77068e;hpb=3db2f8d8f21614408dfd072cc45e618c7905461f

diff --git a/src/test/genealgorithmstest.cpp b/src/test/genealgorithmstest.cpp
index 55ebb58..2b9ae79 100644
--- 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(go2);
+		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);
+	}
 
 };