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

diff --git a/src/test/genealgorithmstest.cpp b/src/test/genealgorithmstest.cpp
index 35f3bf8..ab7f9b8 100644
--- a/src/test/genealgorithmstest.cpp
+++ b/src/test/genealgorithmstest.cpp
@@ -57,7 +57,7 @@ protected:
 	void testRobinsonSchensted (){
 		GeneOrder go(_validPerm.begin(),_validPerm.end());
 		vector<vector<int> > v = robinsonSchensted(go);
-		CPPUNIT_ASSERT_EQUAL(1ul,v.size());
+		CPPUNIT_ASSERT_EQUAL((size_t)1u,v.size());
 		
 		int go11[] = {0,1,2,3,4};
 		CPPUNIT_ASSERT(equal(v[0].begin(),v[0].end(),go11));
@@ -66,7 +66,7 @@ protected:
 		v = robinsonSchensted(go2);
 		int first[] = {0,1,3,5,6,7,9};
 		int second[] = {2,4,8};
-		CPPUNIT_ASSERT_EQUAL(2ul,v.size());
+		CPPUNIT_ASSERT_EQUAL((size_t)2u,v.size());
 		CPPUNIT_ASSERT(equal(v[0].begin(),v[0].end(),first));
 		CPPUNIT_ASSERT(equal(v[1].begin(),v[1].end(),second));
 	}
@@ -85,7 +85,7 @@ protected:
 	void testFindIntervals (){
 		GeneOrder go(_validPerm.begin(),_validPerm.end());
 		vector<Interval> v = findIntervals(go);
-		CPPUNIT_ASSERT_EQUAL(4ul,v.size());
+		CPPUNIT_ASSERT_EQUAL((size_t)4u,v.size());
 		Interval go10(1,1);
 		Interval go12(3,3);
 		CPPUNIT_ASSERT(go10 == v[0]);
@@ -93,7 +93,7 @@ protected:
 		
 		GeneOrder go2(_validPerm2.begin(),_validPerm2.end());
 		v = findIntervals(go2);
-		CPPUNIT_ASSERT_EQUAL(9ul,v.size());
+		CPPUNIT_ASSERT_EQUAL((size_t)9u,v.size());
 		Interval go20(1,3,true);
 		Interval go21(2,2);
 		Interval go22(1,4,true);
@@ -123,7 +123,7 @@ protected:
 		GeneOrder go(_validPerm.begin(),_validPerm.end());
 		vector<Interval> v = findIntervals(go);
 		v = findIntervalsAtPoints(v);
-		CPPUNIT_ASSERT_EQUAL(5ul,v.size());
+		CPPUNIT_ASSERT_EQUAL((size_t)5u,v.size());
 		Interval go10(0,0);
 		Interval go12(2,2);
 		CPPUNIT_ASSERT(go10 == v[1]);
@@ -132,7 +132,7 @@ protected:
 		GeneOrder go2(_validPerm3.begin(),_validPerm3.end());
 		v = findIntervals(go2);
 		v = findIntervalsAtPoints(v);
-		CPPUNIT_ASSERT_EQUAL(17ul,v.size());
+		CPPUNIT_ASSERT_EQUAL((size_t)17u,v.size());
 		Interval go20(0,3);
 		Interval go22(1,1);
 		CPPUNIT_ASSERT(go20 == v[1]);
@@ -151,25 +151,25 @@ protected:
 	void testInversionDistance (){
 		GeneOrder go(_validPerm.begin(),_validPerm.end());
 		size_t d = inversionDistance(go);
-		CPPUNIT_ASSERT_EQUAL(0ul,d);
+		CPPUNIT_ASSERT_EQUAL((size_t)0u,d);
 		
 		GeneOrder go2(_validPerm2.begin(),_validPerm2.end());
 		d = inversionDistance(go2);
-		CPPUNIT_ASSERT_EQUAL(5ul,d);
+		CPPUNIT_ASSERT_EQUAL((size_t)5u,d);
 
 		GeneOrder go3(_validPerm3.begin(),_validPerm3.end());
 		d = inversionDistance(go3);
-		CPPUNIT_ASSERT_EQUAL(13ul,d);
+		CPPUNIT_ASSERT_EQUAL((size_t)13u,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_EQUAL((size_t)4u,v.size());
+		Component go10(0,1,0,0,1);
+		Component go11(1,2,0,1,2);
+		Component go12(2,3,0,2,3);
+		Component go13(3,4,0,3,4);
 		CPPUNIT_ASSERT(go10 == v[0]);
 		CPPUNIT_ASSERT(go11 == v[1]);
 		CPPUNIT_ASSERT(go12 == v[2]);
@@ -177,13 +177,13 @@ protected:
 		
 		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_EQUAL((size_t)6u,v.size());
+		Component go20(1,2,0,2,3);
+		Component go21(0,4,0,0,4);
+		Component go22(4,7,1,4,7);
+		Component go23(-15,-12,-1,8,11);
+		Component go24(-12,-9,-1,11,14);
+		Component go25(7,16,0,7,16);
 		CPPUNIT_ASSERT(go20 == v[0]);
 		CPPUNIT_ASSERT(go21 == v[1]);
 		CPPUNIT_ASSERT(go22 == v[2]);