resolve merge conflict

evolution.py

@@ -210,7 +210,6 @@ def problem_solved(self):
         return 1 
 
     def evolve(self):
-        print("EVOLVE")
         for g in range(self.config.generations):
             self.stats(g)
             if max(self.state.fitness) == 0:

heuristics/h1_1_B.py

@@ -7,33 +7,11 @@
 '''
 
 def h_1_1_B(input, output, output_generated):
-<<<<<<< HEAD
 
-    t = []
-    for i in range(len(output_generated)):
-        t.append(abs(output_generated[i] - 789))
-    return -min(t)
-
-    # rate = 0
-    # if 789 not in output_generated:
-    #     rate -= 100
-
-    # t = []
-    # for i in range(len(output_generated)):
-    #     t.append(abs(output_generated[i] - 789))
-
-    # if min(t)//1000 > 0:
-    #     rate += 30
-    # elif min(t)//100 > 0:
-    #     rate += 60
-    # elif min(t)//10 > 0:
-    #     rate += 90 
-    # return rate
-=======
     tab = [0]
     if 789 not in output_generated:
         tab = []
         for i in range(len(output_generated)):
             tab.append(abs(789 - output_generated[i]))
     return -min(tab)
->>>>>>> 5e7acdac9ace5ed935dce538417db94bc0139b94
+

heuristics/h1_1_C.py

@@ -7,36 +7,10 @@
 '''
 
 def h_1_1_C(input, output, output_generated):
-<<<<<<< HEAD
-
-    t = []
-    for i in range(len(output_generated)):
-        t.append(abs(output_generated[i] - 31415))
-    return -min(t)
-
-    # rate = 0
-    # if 31415 not in output_generated:
-    #     rate -= 100
-
-    # t = []
-    # for i in range(len(output_generated)):
-    #     t.append(abs(output_generated[i] - 31415))
-
-    # if min(t)//10000 > 0:
-    #     rate += 30
-    # elif min(t)//1000 > 0:
-    #     rate += 50
-    # elif min(t)//100 > 0:
-    #     rate += 70
-    # elif min(t)//10 > 0:
-    #     rate += 90
-    # return rate
-=======
     tab = [0]
     if 31415 not in output_generated:
         tab = []
         for i in range(len(output_generated)):
             tab.append(abs(31415 - output_generated[i]))
         return -1 * min(tab)
 
->>>>>>> 5e7acdac9ace5ed935dce538417db94bc0139b94

heuristics/h1_1_D.py

@@ -6,21 +6,7 @@
 '''
 
 def h_1_1_D(input, output, output_generated):
-<<<<<<< HEAD
-
-    return -abs(output_generated[0] - 1)
-
-    # rate = 0
-    # if output_generated[0] != 1:
-    #     rate -= 100
-
-    # # if abs(output_generated[0]-100) < 100 :
-    # #     rate += abs(output_generated[0]-100) 
-
-    # return rate
-=======
     rate = 0
     if output_generated[0] != 1:
         rate -= abs(1 - output_generated[0])
     return rate
->>>>>>> 5e7acdac9ace5ed935dce538417db94bc0139b94

heuristics/h1_1_E.py

@@ -6,20 +6,7 @@
 '''
 
 def h_1_1_E(input, output, output_generated):
-<<<<<<< HEAD
-
-    return -abs(output_generated[0] - 789)
-
-    # rate = 0
-    # if output_generated[0] != 789:
-    #     rate -= 100
-
-    # # if output_generated[0] < 1000 :
-    # #     rate += 100 - output_generated[0] 
-    # return rate
-=======
     rate = 0
     if output_generated[0] != 789:
         rate -= abs(789 - output_generated[0])
     return rate
->>>>>>> 5e7acdac9ace5ed935dce538417db94bc0139b94

heuristics/h1_1_F.py

@@ -9,13 +9,7 @@
 def h_1_1_F(input, output, output_generated):
 
     if len(output_generated) != 1:
-<<<<<<< HEAD
-        return -math.inf
-    else:
-        return -abs(output_generated[0] - 1)
-=======
         rate -= 1000000
     if output_generated[0] != 1:
         rate -= abs(1 - output_generated[0])
     return rate
->>>>>>> 5e7acdac9ace5ed935dce538417db94bc0139b94

heuristics/h1_2_A.py

@@ -9,17 +9,9 @@
 import math
 
 def h_1_2_A(input, output, output_generated):
-<<<<<<< HEAD
-    if len(output_generated) != 1:
-        return -math.inf
-    else:
-        x = int(input[0]) + int(input[1])   
-        return -abs(output_generated[0] - x)
-=======
     rate = 0
     if len(output_generated) != 1:
         rate -= 100000
     if output_generated[0] != input[0] + input[1]:
         rate -= abs(output_generated[0] - (input[0] + input[1]))
     return rate
->>>>>>> 5e7acdac9ace5ed935dce538417db94bc0139b94

heuristics/h1_2_B.py

@@ -9,17 +9,9 @@
 import math
 
 def h_1_2_B(input, output, output_generated):
-<<<<<<< HEAD
-    if len(output_generated) != 1:
-        return -math.inf
-    else:
-        x = int(input[0]) + int(input[1])   
-        return -abs(output_generated[0] - x)
-=======
     rate = 0
     if len(output_generated) != 1:
         rate -= 100000
     if output_generated[0] != input[0] + input[1]:
         rate -= abs(output_generated[0] - (input[0] + input[1]))
     return rate
->>>>>>> 5e7acdac9ace5ed935dce538417db94bc0139b94

heuristics/h1_2_C.py

@@ -9,17 +9,9 @@
 import math
 
 def h_1_2_C(input, output, output_generated):
-<<<<<<< HEAD
-    if len(output_generated) != 1:
-        return -math.inf
-    else:
-        x = int(input[0]) + int(input[1])   
-        return -abs(output_generated[0] - x)
-=======
     rate = 0
     if len(output_generated) != 1:
         rate -= 100000
     if output_generated[0] != input[0] + input[1]:
         rate -= abs(output_generated[0] - (input[0] + input[1]))
     return rate
->>>>>>> 5e7acdac9ace5ed935dce538417db94bc0139b94

heuristics/h1_2_D.py

@@ -8,17 +8,9 @@
 '''
 import math
 def h_1_2_D(input, output, output_generated):
-<<<<<<< HEAD
-    if len(output_generated) != 1:
-        return -math.inf
-    else:
-        x = int(input[0]) - int(input[1])   
-        return -abs(output_generated[0] - x)
-=======
     rate = 0
     if len(output_generated) != 1:
         rate -= 100000
     if output_generated[0] != input[0] - input[1]:
         rate -= abs(output_generated[0] - (input[0] - input[1]))
     return rate
->>>>>>> 5e7acdac9ace5ed935dce538417db94bc0139b94

heuristics/h1_2_E.py

@@ -9,17 +9,9 @@
 import math
 
 def h_1_2_E(input, output, output_generated):
-<<<<<<< HEAD
-    if len(output_generated) != 1:
-        return -math.inf
-    else:
-        x = int(input[0]) * int(input[1])   
-        return -abs(output_generated[0] - x)
-=======
     rate = 0
     if len(output_generated) != 1:
         rate -= 100000
     if output_generated[0] != input[0] * input[1]:
         rate -= abs(output_generated[0] - (input[0] * input[1]))
     return rate
->>>>>>> 5e7acdac9ace5ed935dce538417db94bc0139b94

heuristics/h1_3_A.py

@@ -9,30 +9,9 @@
 import math
 
 def h_1_3_A(input, output, output_generated):
-<<<<<<< HEAD
-    if len(output_generated) != 1:
-        return -math.inf
-    else:
-        o = 0
-        a = int(input[0])
-        b = int(input[1])
-        x = a if a > b else b
-        if output_generated[0] != a and output_generated[0] != b:
-            o -= 1000
-        elif x == a:
-            if output_generated[0] == b:
-                o -= 100
-        elif x == b:
-            if output_generated[0] == a:
-                o -= 100
-        o -= abs(output_generated[0] - x)
-    return o
-        # return -abs(output_generated[0] - x)
-=======
     rate = 0
     if len(output_generated) != 1:
         rate -= 100000
     if output_generated[0] != max(input[0], input[1]):
         rate -= 100
     return rate
->>>>>>> 5e7acdac9ace5ed935dce538417db94bc0139b94

heuristics/h1_3_B.py

@@ -9,29 +9,9 @@
 import math
 
 def h_1_3_B(input, output, output_generated):
-<<<<<<< HEAD
-    if len(output_generated) != 1:
-        return -math.inf
-    else:
-        o = 0
-        a = int(input[0])
-        b = int(input[1])
-        x = a if a > b else b
-        if output_generated[0] != a and output_generated[0] != b:
-            o -= 100000
-        elif x == a:
-            if output_generated[0] == b:
-                o -= 10000
-        elif x == b:
-            if output_generated[0] == a:
-                o -= 10000
-        o -= abs(output_generated[0] - x)
-    return o
-=======
     rate = 0
     if len(output_generated) != 1:
         rate -= 100000
     if output_generated[0] != max(input[0], input[1]):
         rate -= 100
     return rate
->>>>>>> 5e7acdac9ace5ed935dce538417db94bc0139b94

heuristics/h1_4_A.py

@@ -11,17 +11,9 @@
 import math
 
 def h_1_4_A(input, output, output_generated):
-<<<<<<< HEAD
-    if len(output_generated) != 1:
-        return -math.inf
-    else: 
-        return -abs(int(output[0]) - output_generated[0])
-
-=======
     rate = 0
     if len(output_generated) != 1:
         rate -= 100000
     if output_generated[0] != output[0]:
         rate -= abs(output_generated[0] - output[0])
     return rate
->>>>>>> 5e7acdac9ace5ed935dce538417db94bc0139b94