next iteration

eo/src/pyeo/test/test_breeders.py

@@ -1,16 +1,12 @@
 from maxone import *
 import unittest
 	
-evaluate = EvalFunc()
-init = Init(20)
-mutate = Mutate()
-xover = Crossover()
-
-class TestSGA(unittest.TestCase):
+class TestBreeders(unittest.TestCase):
     
     def runtest(self, breed):
 	
-	pop = eoPop(50, init)
+	pop = eoPop(50, Init(20))
+	evaluate = EvalFunc()
 	for indy in pop: evaluate(indy)
 	
 	newpop = eoPop();
@@ -24,12 +20,10 @@ class TestSGA(unittest.TestCase):
     def testGeneralBreeder(self):
 	
 	seq = eoSequentialOp();
-	seq.add(xover, 0.7)
-	seq.add(mutate, 0.9)
+	seq.add(Crossover(), 0.7)
+	seq.add(Mutate(), 0.1)
 
-	sel = eoDetTournamentSelect(3)
-
-	breed = eoGeneralBreeder(sel, seq)
+	breed = eoGeneralBreeder(eoDetTournamentSelect(3), seq)
 
 	self.runtest(breed)
 

eo/src/pyeo/test/test_mo.py

@@ -95,7 +95,8 @@ class NSGA_II(eoAlgo):
 	    
 	    i += 1
 	    if i%100 == 0:
-		pass #do_plot(pop)
+		pass 
+		do_plot(pop)
 	    
 	worths = self.perf2worth.getValue()
 	
@@ -163,9 +164,8 @@ class TestNSGA_II(unittest.TestCase):
 
     def testNSGA_II(self):
 	
-	init = MyInit();
 	evaluate = AnEval();
-	pop = eoPop(25, init)
+	pop = eoPop(25, MyInit())
 	for indy in pop: evaluate(indy)
 	
 	nsga = NSGA_II(50)