X-Git-Url: https://ruin.nu/git/?p=germs.git;a=blobdiff_plain;f=src%2Ftest%2Fgenesortertest.cpp;h=479db468e25d97d048d5c7cb9acdc54bdd54cb3c;hp=b06191827c58376cd50e31346094dea7e05d7280;hb=3fff88637ec7e806f19e613051f31ca5178d2cf5;hpb=3401199b1ce268dd6465f09abf6264592b989140 diff --git a/src/test/genesortertest.cpp b/src/test/genesortertest.cpp index b061918..479db46 100644 --- a/src/test/genesortertest.cpp +++ b/src/test/genesortertest.cpp @@ -62,16 +62,16 @@ protected: GeneOrder go2(_validPerm2.begin(),_validPerm2.end()); al = so.sort(go2); CPPUNIT_ASSERT_EQUAL(1ul,al.size()); - CPPUNIT_ASSERT((*al[0]) == ReverseAction(2,3)); + CPPUNIT_ASSERT(al[0] == ReverseAction(2,3)); - (*al[0])(go2); + al[0](go2); CPPUNIT_ASSERT(equal(go.begin(),go.end(),go2.begin())); GeneOrder go3(_validPerm3.begin(),_validPerm3.end()); al = so.sort(go3); CPPUNIT_ASSERT_EQUAL(5ul,al.size()); for (size_t i = 0; i < al.size(); ++i) - (*al[i])(go3); + al[i](go3); int perm[] = {0,1,2,3,4,5,6,7,8,9}; CPPUNIT_ASSERT(equal(go3.begin(),go3.end(),perm)); } @@ -84,8 +84,8 @@ protected: GeneOrder go2(_validPerm2.begin(),_validPerm2.end()); al = so.safeActions(go2); CPPUNIT_ASSERT_EQUAL(1ul,al.size()); - CPPUNIT_ASSERT((*al[0]) == ReverseAction(2,3)); - CPPUNIT_ASSERT(!((*al[0]) == ReverseAction(2,5))); + CPPUNIT_ASSERT(al[0] == ReverseAction(2,3)); + CPPUNIT_ASSERT(!(al[0] == ReverseAction(2,5))); } };