sorting without hurdles seems to work

[germs.git] / src / test / genesortertest.cpp

diff --git a/src/test/genesortertest.cpp b/src/test/genesortertest.cpp
index 6a58ce2b8fb6e8fa0ecace92a3542d2823545c83..157e3c40be6c8764476a10b829babc58545766cf 100644 (file)
--- a/src/test/genesortertest.cpp
+++ b/src/test/genesortertest.cpp
@@ -83,16 +83,20 @@ protected:
 
                GeneOrder go2(_validPerm2.begin(),_validPerm2.end());
                al = so.safeActions(go2);
-               CPPUNIT_ASSERT_EQUAL(1ul,al.size());
+               CPPUNIT_ASSERT_EQUAL(2ul,al.size());
                CPPUNIT_ASSERT(al[0] == ReverseAction(2,3));
+               CPPUNIT_ASSERT(al[1] == ReverseAction(2,3));
                CPPUNIT_ASSERT(!(al[0] == ReverseAction(2,5)));
 
                GeneOrder go3(_validPerm3.begin(),_validPerm3.end());
                al = so.safeActions(go3);
                CPPUNIT_ASSERT(al.size() > 0);
-               size_t cycles = countCycles(go3);
-               al[0](go3);
-               CPPUNIT_ASSERT(cycles < countCycles(go3));
+               size_t dist = inversionDistance(go3);
+               for (size_t i = 0; i < al.size(); ++i){
+                       GeneOrder go(go3);
+                       al[0](go);
+                       CPPUNIT_ASSERT(dist > inversionDistance(go));
+               }
        }
 
 };