d

RotTable.py

@@ -21,7 +21,7 @@ class RotTable:
         "TA": [36, 0.9, 0, 1.1, 2, 0],\
         "TC": [36.9, 5.3, -120, 0.9, 6, 0],\
         "TG": [34.5, 3.5, 64, 0.9, 34, 0],\
-        "TT": [35.62, 7.2, -154, 0.06, 0.6, 0]\
+        "TT": [35.62, 7.2, 154, 0.06, 0.6, 0]\
         }
 
     # get the angles in each axis (x, y, z), considering the deviation
@@ -63,7 +63,7 @@ class RotTable:
 
     ###################
 
-# table1 = RotTable()
-# print(table1.orta())
+table1 = RotTable()
+print(table1.orta())
 
-# print(table1.rot_table["AA"])
+print(table1.rot_table["AA"])

population.py

@@ -74,11 +74,7 @@ class Population:
             echanger(tableau,debut,randint(debut,fin-1)) 
             partition=debut
             for i in range(debut+1,fin):
-<<<<<<< HEAD
-                #if tableau[i] < tableau[debut]:
-=======
                 # if tableau[i] < tableau[debut]:
->>>>>>> ea595ada3becbb697c8735a8fbdc55f04e1606a2
                 if tableau[i].score<tableau[debut].score: 
                     partition+=1 
                     echanger(tableau,i,partition)