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

diff --git a/src/test/genealgorithmstest.cpp b/src/test/genealgorithmstest.cpp
index 0fca4d2..f2bd118 100644
--- a/src/test/genealgorithmstest.cpp
+++ b/src/test/genealgorithmstest.cpp
@@ -24,7 +24,8 @@ class TESTNAME : public CPPUNIT_NS::TestFixture
   CPPUNIT_TEST( testLongestSequences );
   CPPUNIT_TEST( testFindIntervals );
   CPPUNIT_TEST( testFindIntervalsAtPoints );
-  //CPPUNIT_TEST( testCountCycles );
+  CPPUNIT_TEST( testCountCycles );
+  CPPUNIT_TEST( testFindComponents );
   CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -94,27 +95,29 @@ protected:
 		CPPUNIT_ASSERT_EQUAL(16ul,v.size());
 		Interval go20(1,2);
 		Interval go22(4,2);
+		Interval go215(8,16);
 		CPPUNIT_ASSERT(go20 == v[0]);
 		CPPUNIT_ASSERT(go22 == v[2]);
+		CPPUNIT_ASSERT(go215 == v[15]);
 	}
 	void testFindIntervalsAtPoints (){
 		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());
@@ -126,6 +129,36 @@ protected:
 		CPPUNIT_ASSERT_EQUAL(6,c);
 	}
 
+	void testFindComponents (){
+		GeneOrder go(_validPerm.begin(),_validPerm.end());
+		vector<Component> v = findComponents(go);
+		CPPUNIT_ASSERT_EQUAL(4ul,v.size());
+		Component go10(0,1,0);
+		Component go11(1,2,0);
+		Component go12(2,3,0);
+		Component go13(3,4,0);
+		CPPUNIT_ASSERT(go10 == v[0]);
+		CPPUNIT_ASSERT(go11 == v[1]);
+		CPPUNIT_ASSERT(go12 == v[2]);
+		CPPUNIT_ASSERT(go13 == v[3]);
+		
+		GeneOrder go2(_validPerm3.begin(),_validPerm3.end());
+		v = findComponents(go2);
+		CPPUNIT_ASSERT_EQUAL(6ul,v.size());
+		Component go20(1,2,0);
+		Component go21(0,4,0);
+		Component go22(4,7,1);
+		Component go23(-15,-12,-1);
+		Component go24(-12,-9,-1);
+		Component go25(7,16,0);
+		CPPUNIT_ASSERT(go20 == v[0]);
+		CPPUNIT_ASSERT(go21 == v[1]);
+		CPPUNIT_ASSERT(go22 == v[2]);
+		CPPUNIT_ASSERT(go23 == v[3]);
+		CPPUNIT_ASSERT(go24 == v[4]);
+		CPPUNIT_ASSERT(go25 == v[5]);
+	}
+
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION( TESTNAME );