diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..7e99e367f8443d86e5e8825b9fda39dfbb39630d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.pyc \ No newline at end of file diff --git a/RotTable.py b/RotTable.py index 37762b4121d2412f728194a4da8245389cc6a30a..9a4d2e7b0198f228401b843ca847662948c3ca1a 100644 --- a/RotTable.py +++ b/RotTable.py @@ -75,13 +75,13 @@ class RotTable: ################### def getTwist(self, dinucleotide): - return RotTable.__ORIGINAL_ROT_TABLE[dinucleotide][0] + return self.rot_table[dinucleotide][0] def getWedge(self, dinucleotide): - return RotTable.__ORIGINAL_ROT_TABLE[dinucleotide][1] + return self.rot_table[dinucleotide][1] def getDirection(self, dinucleotide): - return RotTable.__ORIGINAL_ROT_TABLE[dinucleotide][2] + return self.rot_table[dinucleotide][2] ################### diff --git a/__pycache__/Initialisation.cpython-37.pyc b/__pycache__/Initialisation.cpython-37.pyc deleted file mode 100644 index e986e03a10e3574402c013796cf8296d4a58eb32..0000000000000000000000000000000000000000 Binary files a/__pycache__/Initialisation.cpython-37.pyc and /dev/null differ diff --git a/__pycache__/RotTable.cpython-36.pyc b/__pycache__/RotTable.cpython-36.pyc deleted file mode 100644 index dbb2e4134f6503a6df95598a7c5505e659fc5c85..0000000000000000000000000000000000000000 Binary files a/__pycache__/RotTable.cpython-36.pyc and /dev/null differ diff --git a/__pycache__/RotTable.cpython-37.pyc b/__pycache__/RotTable.cpython-37.pyc index ed04a7a7696074bf48fd76a803920c0ac6b0436a..e6bef50c3581cf2f06a53777c7291030d276cecd 100644 Binary files a/__pycache__/RotTable.cpython-37.pyc and b/__pycache__/RotTable.cpython-37.pyc differ diff --git a/__pycache__/Traj3D.cpython-36.pyc b/__pycache__/Traj3D.cpython-36.pyc deleted file mode 100644 index ecd80201694553fe02c71577fca8c84a37602d91..0000000000000000000000000000000000000000 Binary files a/__pycache__/Traj3D.cpython-36.pyc and /dev/null differ diff --git a/__pycache__/croisement.cpython-37.pyc b/__pycache__/croisement.cpython-37.pyc index 52535af1946a5de3affb751a7f7e1c82597184ea..3c0b7814b5726496f728cff297117c1679b51da0 100644 Binary files a/__pycache__/croisement.cpython-37.pyc and b/__pycache__/croisement.cpython-37.pyc differ diff --git a/__pycache__/individu.cpython-37.pyc b/__pycache__/individu.cpython-37.pyc index eda82fc2d70c64f8f830c79a72a2bdca5468d801..af04e82760def202853d9a3c799aeaa8eb2c20f9 100644 Binary files a/__pycache__/individu.cpython-37.pyc and b/__pycache__/individu.cpython-37.pyc differ diff --git a/__pycache__/population.cpython-37.pyc b/__pycache__/population.cpython-37.pyc index 389f5e41a7cfda56472f642d82e232740e8770af..cd1f744dd32f7a248c3ae2481fa0bd1243989c5a 100644 Binary files a/__pycache__/population.cpython-37.pyc and b/__pycache__/population.cpython-37.pyc differ diff --git a/algogenetique.py b/algogenetique.py index 9b91cb95af25a08044e3ecc9e682ca1e82153211..9e681de9dd01d77569355a0ae01139ec8828adbc 100644 --- a/algogenetique.py +++ b/algogenetique.py @@ -29,11 +29,13 @@ def main(N,tmax,pmutation, proportion,brin="plasmid_8k.fasta"): best=individu max=individu.score L.append(max) - print(L) + #print(L) plt.plot([i for i in range(tmax)], L) plt.show() - return(individu) + return(best) + + +main(100,50,0.015,50) -main(100,50,0.015,2) diff --git a/croisement.py b/croisement.py index 48a399f3e03e49d46867b53a1695e99657f13c67..2bdb485cc5acfb57439e45e856e88296edb25876 100644 --- a/croisement.py +++ b/croisement.py @@ -18,7 +18,7 @@ ROT_TABLE = {\ "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]\ } diff --git a/individu.py b/individu.py index 9082f6167ee8b63ce469d851beb75d9a00c464b0..5116b5ef465663be26bc96913278830ccde2ad96 100644 --- a/individu.py +++ b/individu.py @@ -32,7 +32,7 @@ class Individu(): # print(rot_computed) #diff_angle = sum(abs(rot_computed - rot_traj)) - self.score = 1/(distance) + self.score = 1/distance def mutation(self, proba = P1): diff --git a/population.py b/population.py index 1af8dc965318864929e1462d992a0bd7bc746fa5..c16d0101e1233c9ff230563b1ca492f6bf6656fa 100644 --- a/population.py +++ b/population.py @@ -55,7 +55,7 @@ class Population: y=self.indiv[t] vu.add(t) vu.add(m) - if x.score<=y.score: + if x.score>=y.score: newself.append(x) else: newself.append(y)