branched out to multiobjective

.gitignore

@@ -94,11 +94,3 @@ ENV/
 .ropeproject
 
 *.png
-
-EA/results/03041650/0/
-
-EA/results/03041656/0/
-
-EA/results/03041656/1/
-
-EA/results/03041708/0/

EA/fitness.py

@@ -16,17 +16,15 @@ def evaluate_deck_by_wins(individual):
     decklist = genome_to_decklist(individual)
     filename = "candidate.dck"
     write_decklist(ct.CARD_DIRECTORY + filename, decklist)
-    wins = [0]*len(ct.OPPONENTS)
-    for counter, opponent in enumerate(ct.OPPONENTS):
+    wins = 0
+    for opponent in ct.OPPONENTS:
         cmd = build_cmd(filename, opponent, ct.MATCHES_PER_OPPONENT)
         p = subprocess.Popen(cmd, cwd=ct.FORGE_PATH, stdout=subprocess.PIPE)
         for line in p.stdout:
             line = line.decode("utf-8").strip()
             if 'Match result' in line:
                 result = line.split(' ')
-        wins[counter] += int(result[3])
+        wins += int(result[3])
         p.wait()
-    for i in range(len(ct.OPPONENTS)):
-        wins[i] = (wins[i] / float(number_of_matches)) * 100
-    wins = [round(x, 2) for x in wins]
-    return tuple(wins)  # MUST BE TUPLE!
+    fitness = (wins / float(number_of_matches)) * 100
+    return fitness,  # MUST BE TUPLE!