cast to size_t instead of asuming unsigned long

diff --git a/src/test/genealgorithmstest.cpp b/src/test/genealgorithmstest.cpp
index 35f3bf8bca3010d8d3c73254e5c86e0b5f32d7a5..43ba77f77ed3c10087c8d894e5a9feeb2418a6cd 100644 (file)
--- 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,21 +151,21 @@ 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());
+               CPPUNIT_ASSERT_EQUAL((size_t)4u,v.size());
                Component go10(0,1,0);
                Component go11(1,2,0);
                Component go12(2,3,0);
@@ -177,7 +177,7 @@ protected:
                
                GeneOrder go2(_validPerm3.begin(),_validPerm3.end());
                v = findComponents(go2);
-               CPPUNIT_ASSERT_EQUAL(6ul,v.size());
+               CPPUNIT_ASSERT_EQUAL((size_t)6u,v.size());
                Component go20(1,2,0);
                Component go21(0,4,0);
                Component go22(4,7,1);

diff --git a/src/test/genesortertest.cpp b/src/test/genesortertest.cpp
index 5c5007b10e522de0ed6a3879c5291878f41c121a..1625dbd5607d64615cece2b823bf2f55fac4c7c6 100644 (file)
--- a/src/test/genesortertest.cpp
+++ b/src/test/genesortertest.cpp
@@ -57,11 +57,11 @@ protected:
                GeneSorter so;
                GeneOrder go(_validPerm.begin(),_validPerm.end());
                GeneSorter::ActionList al = so.sort(go);
-               CPPUNIT_ASSERT_EQUAL(0ul,al.size());
+               CPPUNIT_ASSERT_EQUAL((size_t)0u,al.size());
 
                GeneOrder go2(_validPerm2.begin(),_validPerm2.end());
                al = so.sort(go2);
-               CPPUNIT_ASSERT_EQUAL(1ul,al.size());
+               CPPUNIT_ASSERT_EQUAL((size_t)1u,al.size());
                CPPUNIT_ASSERT(al[0] == ReverseAction(2,3));
 
                al[0](go2);
@@ -69,7 +69,7 @@ protected:
 
                GeneOrder go3(_validPerm3.begin(),_validPerm3.end());
                al = so.sort(go3);
-               CPPUNIT_ASSERT_EQUAL(5ul,al.size());
+               CPPUNIT_ASSERT_EQUAL((size_t)5u,al.size());
                for (size_t i = 0; i < al.size(); ++i)
                        al[i](go3);
                int perm[] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16};
@@ -77,7 +77,7 @@ protected:
 
                GeneOrder go4(_validPerm4.begin(),_validPerm4.end());
                al = so.sort(go4);
-               CPPUNIT_ASSERT_EQUAL(13ul,al.size());
+               CPPUNIT_ASSERT_EQUAL((size_t)13u,al.size());
                for (size_t i = 0; i < al.size(); ++i)
                        al[i](go3);
                CPPUNIT_ASSERT(equal(go3.begin(),go3.end(),perm));
@@ -86,11 +86,11 @@ protected:
                GeneSorter so;
                GeneOrder go(_validPerm.begin(),_validPerm.end());
                GeneSorter::ActionList al = so.safeActions(go);
-               CPPUNIT_ASSERT_EQUAL(0ul,al.size());
+               CPPUNIT_ASSERT_EQUAL((size_t)0u,al.size());
 
                GeneOrder go2(_validPerm2.begin(),_validPerm2.end());
                al = so.safeActions(go2);
-               CPPUNIT_ASSERT_EQUAL(2ul,al.size());
+               CPPUNIT_ASSERT_EQUAL((size_t)2u,al.size());
                CPPUNIT_ASSERT(al[0] == ReverseAction(2,3));
                CPPUNIT_ASSERT(al[1] == ReverseAction(2,3));
                CPPUNIT_ASSERT(!(al[0] == ReverseAction(2,5)));