X-Git-Url: https://ruin.nu/git/?p=germs.git;a=blobdiff_plain;f=src%2Ftest%2Fgenealgorithmstest.cpp;h=ab7f9b8c4cf47ee9159b63e911a2734e46be777f;hp=43ba77f77ed3c10087c8d894e5a9feeb2418a6cd;hb=dcd966c5fca7dca53ca1f605f70f13f019d29771;hpb=8e617d91244bf6c8b22503850e10909fa2071c44 diff --git a/src/test/genealgorithmstest.cpp b/src/test/genealgorithmstest.cpp index 43ba77f..ab7f9b8 100644 --- a/src/test/genealgorithmstest.cpp +++ b/src/test/genealgorithmstest.cpp @@ -166,10 +166,10 @@ protected: GeneOrder go(_validPerm.begin(),_validPerm.end()); vector v = findComponents(go); CPPUNIT_ASSERT_EQUAL((size_t)4u,v.size()); - Component go10(0,1,0); - Component go11(1,2,0); - Component go12(2,3,0); - Component go13(3,4,0); + 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]); @@ -178,12 +178,12 @@ protected: GeneOrder go2(_validPerm3.begin(),_validPerm3.end()); v = findComponents(go2); CPPUNIT_ASSERT_EQUAL((size_t)6u,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); + 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]);