X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=src%2Ftest%2Fgenesortertest.cpp;h=3827d4114ad3fa2f04c18cf767a04d1e57e4d746;hb=0ced9c229cf05fa677686df27eca9f167f11a87f;hp=1625dbd5607d64615cece2b823bf2f55fac4c7c6;hpb=df43b4d5065d855b230c07341e77f817591f530c;p=germs.git

diff --git a/src/test/genesortertest.cpp b/src/test/genesortertest.cpp
index 1625dbd..3827d41 100644
--- a/src/test/genesortertest.cpp
+++ b/src/test/genesortertest.cpp
@@ -5,6 +5,8 @@
 #include <geneorder.h>
 #include <genealgorithms.h>
 #include <reverseaction.h>
+#include <models.h>
+#include <model.h>
 
 #include <algorithm>
 #include <iterator>
@@ -56,11 +58,11 @@ protected:
 	void testSort (){
 		GeneSorter so;
 		GeneOrder go(_validPerm.begin(),_validPerm.end());
-		GeneSorter::ActionList al = so.sort(go);
+		GeneSorter::ActionList al = so.sort(go,Model(new Models::ModelImpl));
 		CPPUNIT_ASSERT_EQUAL((size_t)0u,al.size());
 
 		GeneOrder go2(_validPerm2.begin(),_validPerm2.end());
-		al = so.sort(go2);
+		al = so.sort(go2,Model(new Models::ModelImpl));
 		CPPUNIT_ASSERT_EQUAL((size_t)1u,al.size());
 		CPPUNIT_ASSERT(al[0] == ReverseAction(2,3));
 
@@ -68,7 +70,7 @@ protected:
 		CPPUNIT_ASSERT(equal(go.begin(),go.end(),go2.begin()));
 
 		GeneOrder go3(_validPerm3.begin(),_validPerm3.end());
-		al = so.sort(go3);
+		al = so.sort(go3,Model(new Models::ModelImpl));
 		CPPUNIT_ASSERT_EQUAL((size_t)5u,al.size());
 		for (size_t i = 0; i < al.size(); ++i)
 			al[i](go3);
@@ -76,10 +78,10 @@ protected:
 		CPPUNIT_ASSERT(equal(go3.begin(),go3.end(),perm));
 
 		GeneOrder go4(_validPerm4.begin(),_validPerm4.end());
-		al = so.sort(go4);
+		al = so.sort(go4,Model(new Models::ModelImpl));
 		CPPUNIT_ASSERT_EQUAL((size_t)13u,al.size());
 		for (size_t i = 0; i < al.size(); ++i)
-			al[i](go3);
+			al[i](go4);
 		CPPUNIT_ASSERT(equal(go3.begin(),go3.end(),perm));
 	}
 	void testSafeActions (){