X-Git-Url: https://ruin.nu/git/%3CTMPL_VAR%20NAME=PAGE%3E?a=blobdiff_plain;f=src%2Ftest%2Fgenealgorithmstest.cpp;h=35f3bf8bca3010d8d3c73254e5c86e0b5f32d7a5;hb=7e811915a713eeef44f03385a1fc1f74a5301c30;hp=3f57e0fa3e47a246c02a557e7b0fbeea6996bc98;hpb=6724d50f2d36dccd383d95d36f7fe328b2692bc0;p=germs.git

diff --git a/src/test/genealgorithmstest.cpp b/src/test/genealgorithmstest.cpp
index 3f57e0f..35f3bf8 100644
--- a/src/test/genealgorithmstest.cpp
+++ b/src/test/genealgorithmstest.cpp
@@ -25,6 +25,8 @@ class TESTNAME : public CPPUNIT_NS::TestFixture
   CPPUNIT_TEST( testFindIntervals );
   CPPUNIT_TEST( testFindIntervalsAtPoints );
   CPPUNIT_TEST( testCountCycles );
+  CPPUNIT_TEST( testFindComponents );
+  CPPUNIT_TEST( testInversionDistance );
   CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -82,39 +84,59 @@ 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]);*/
 	}
 	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 +148,50 @@ protected:
 		CPPUNIT_ASSERT_EQUAL(6,c);
 	}
 
+	void testInversionDistance (){
+		GeneOrder go(_validPerm.begin(),_validPerm.end());
+		size_t d = inversionDistance(go);
+		CPPUNIT_ASSERT_EQUAL(0ul,d);
+		
+		GeneOrder go2(_validPerm2.begin(),_validPerm2.end());
+		d = inversionDistance(go2);
+		CPPUNIT_ASSERT_EQUAL(5ul,d);
+
+		GeneOrder go3(_validPerm3.begin(),_validPerm3.end());
+		d = inversionDistance(go3);
+		CPPUNIT_ASSERT_EQUAL(13ul,d);
+	}
+
+	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 );