From 14190110b44977fcc12aba18aca9ee46d6071168 Mon Sep 17 00:00:00 2001 From: Remi Ehounou Date: Sat, 11 Sep 2021 13:58:34 -0400 Subject: [PATCH] Added iteration limit to annealing algorithm --- MDAF/SampleAlgorithms/SimmulatedAnnealing.py | 2 +- .../SimmulatedAnnealing.cpython-39.pyc | Bin 1752 -> 1795 bytes MDAF/__pycache__/MDAF.cpython-39.pyc | Bin 11380 -> 11391 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/MDAF/SampleAlgorithms/SimmulatedAnnealing.py b/MDAF/SampleAlgorithms/SimmulatedAnnealing.py index 2b21c8a..9361eaa 100644 --- a/MDAF/SampleAlgorithms/SimmulatedAnnealing.py +++ b/MDAF/SampleAlgorithms/SimmulatedAnnealing.py @@ -45,7 +45,7 @@ def main(func, S, args): Best[:] = cp.deepcopy(S) sigma = 0.1 route.append(Best[:]) - while True: + for iterationstep in range(100000): print('\n\n\n') R = tweak(cp.deepcopy(S),p,sigma,high, low) #print(R) diff --git a/MDAF/SampleAlgorithms/__pycache__/SimmulatedAnnealing.cpython-39.pyc b/MDAF/SampleAlgorithms/__pycache__/SimmulatedAnnealing.cpython-39.pyc index 3df95fd7a6a0e7ab12e8fe52e5e505966a26029f..8cf3f133d42abafda5a51aeb4bd51a3abda9a01c 100644 GIT binary patch delta 401 zcmYL_ze)o^5XNWjb~l&H?p=uC&;%_6!4!g4{vlwYm92#+SOhLbJh_<579x9C9122; zz`j6I_yFPy_!yQxft8J5;lv2p;bVT^%rFD{u8Kf)l=6XI^x5u=Uev%1s^m(fBhv8J zj@HzJ{Sa;5$4M z^cObat5~&9d^fyMJ>AVZy4O#Kx_e{a_~v1oMgVIl91mx~kU4@pBT4d+D=9k|p+Ldv SP91%eZi8~oZJ=j2#Op89@Kovm delta 363 zcmYLE!Ab)`3{7@t#_sOS7S>v%g&sUvdQm(mQcr$>f(H?MDb%7}tnPG9l0Eh6p)fzt z;ulDN#e?(<^dCH!qR@mS@4bYCOw&(e`o_e-c6-$AyLVHBX_cAcIOmw$``7Skgy144 z=ZbKFq$s8>s!U~>xR??W1k~t!*us-Tjd}%b?IXG84`d5de<2TBEBS06#?EH^t8H;w;o}PLY{0Nx^>6anf6M)|Q>K6! ns-S{v7bpV7TwumZJ=CZ%z&a{aq88M6LWd2mS=d13FV*rFd(BHD diff --git a/MDAF/__pycache__/MDAF.cpython-39.pyc b/MDAF/__pycache__/MDAF.cpython-39.pyc index caa14547ba8e184cfbbba667a8a492637ecfe899..09086b1e772895e2856dd579257748324d871c4f 100644 GIT binary patch delta 2829 zcmaJ@-ESMm5$EwJiV{VAn6@NJqCP0f;)gyd*->g)K1q@6#2;`%C$X;v*fV!&oppD- z>>aJrKr174QJ^h?B-c`DG(>@l>Y zHl?89Z)fH=JG(nO%dc<#`(|E?#X1A<`RmrI*0&Z2JjTJ{j|>9^{+-)z<=@zEHwMf> zbx;bB0FjM^IiwB?95F`Bq?#1C!x%Nk)G>iOjd62AO$i(|Ce5^(7Pt%aQ|gq!vJqEL zlPu{bJ&z=H`eK0elDWq`LEg+r4;{Tdrr#pf3%-Thy-$I^TRs2Su-@37Wjq8lC;`zBJax! zt$YuHUT|)~lk}{_E+DCuzt_2H=#E>in)cc*U+cP&YmwMGcmhE=LSWCq&_LA|{~(p* z$ygWvvP*jwY1yC`Vwy!5?uAbe3cAd4oE>PS?nU3 zTZtZKJdRz?qv0UPkf??jbqwG2sQ-^J#1_BRy^@(|MZ3~MN1cD{JAc}Jeo`2|%WvQJ zOZ1#S`+xl&3O^LjqF6!kJrFAYWzW>sHXtwLP)a6cJo$6zrOtNfcD7CwV8#jW0%zGZ-F2bS07j>a6e$v^5{*giTvI|oi)J4{nE zT)+0SA^(tHz(``-MUjZgYB#Co)EIrGG0`_1Oyf2}P2h#{q`hp+3p+bCS2w&!xoX!d zIvnx<|3Un+bcTN%zmXOjB!mbS-($Ky_vE@e*u^x9bU&OL`!P#p)Mb~4D((hU6pgjGqI7uyx2P^-u-WPasS}?z$D(Dcv-XwD1_gj=lXZJ&-m_rsoRS<_krZK zRg9|UX8pB#(*0vOiAk1y)(5GLrE3`YV-QUS!>xv9CSCJ_wtlQRob!3{NwXVE#tYxq zj2d;=CH}_bYtrW1>CIVu0=y9D9W|_3cMY(LP5A@p{YKhh8&z@noY97zwsC9zHl?mz z1qaAM+`qRF%cAqJO$;dA1Jgr+ZXL_%`+iRK)3@fuL>c5ZS1-fc!*ZZF#<}ftr0K<# zV>R3=mgCjjfl;C;+E85L_okP6MY+nRZh5k){g6Gwe?L8u!7L#8hv@b>3h{c1%Nf0| zJ2g@Dh3BsEZ>E0%Ykxg66YfQ~9{x$D*e})~gkZFpRYDEQliBh8;RjJ=y}WDCdSTA4 zKj>7}4O_P;;tpklRrf4ky;0lMt)`2>%ZK!5efP^$^O+Il3avJYS2ee;Ip`2mu9i2e z%+$-fI6R?T)hVxJd-l7O>y+tLqL)!0SFTt0s9_X!>n^;FtU2j*rkCj=I&>-m3w>01 zv8FNCXLc(uY0zPG226D9Qi^45r&6Kp+tJP*tx&@cQnYuVr2*c55K)RQwNc$6kO&jC3-~%O zzP7(bK?WrgVEm`KK52=+mm7y1^!v?l(fzNoZE_cAyadAST|4PS93jJRR
`uKi+B7v<^v_~%pTQiI!{MiC;(5Lz7!W6nkn!jxh g|DbwWERj{1qh`=G?0e2CpPv~FN?rWoOj?ru16}}@2mk;8 delta 2758 zcmaJ@TWl0n7@jk;x87TN-L~6y+tTi(ExRmWfl`*XfC?2AQ5ez9u;;W6o!MQ^?1C7u zL~1l>L_E=$7~?I*G|`yYH+@m!gD*y3e3=(bd@%UpC72jPqW^yeON*D?%s2n}Z|6V% z|DSW_&!g9mCXKqfY6X5*I>wFnCKTm+9IXBMV338!S-O&ZVNtW%?G8Om6spjm)oFL> zU6Kx2-F8HeNV>}Ev3vDCNmpA@yI=2@bPeza^Z`k0ROVL?lbtj;|3Pa;QL>U^M+;R za-*Wzzc1a3#sdhqCXp1*#Jd27;Bl~^AuZ(NT`QOToun@c<7Fae^$fkh%FHRxRSNlC z;`2a?^oidB$NSNT>noc!a~n#$m}icY!%?o_@EFK=L^#1TiHdiF36cR8GpW}NUzG+K?{t)8$0INu);H)?Ce=e5RmG>faQj~fNbF&Cb>D$QNL0~uwvrj=eC z&AcZ}`<($#pS00qMNTvFisP`n!GT8pc72a+gQRyi8#KF%D=Q(dor4qeQM@%r&t zACgjfV3k_0eBM)jwSL#Y|LQ&I>HS{6Yuo?oElNFvafCY%wgb3gpi1%y2549r>uKOC9V34JbVB8kd}j*SP`bu}ayr z+)%z)Iy+}VCELXA<^yDlc&_<@L74>!(pU2tZk8EmC77HQ%0}5N7A~)7EpMpM?(eiM zx9$SJ*W~&R0mWMp+Jw>G)+k#Iqq=sT0JB{@(|#i0F~v{qpOK_^zav6o;;W8Kyb07? zKQEp*>F_ypu>nA@<}h`^u*@eI?5MLPj5HZ8H)HzTz+92%8ReKjzEyk_9<7ndcnZg@ z;>Yl%mi24lM?mu4%CnuDG4@ZoAKZC2FqSp0qQ!j(_anpWLoRD{n+M!3zo6obI2aj+ zJ^Xa!=Lnt+dh5-c+mNKghF!AQVTc;4`BG2HD|beG(Gw5fiPr1Ax*9FAYb({gHweTP zj84TcF8(sYEB{oNdj~EE4B}Muh}_~(-#1Y+`yc8_PyOfU@ifl8OkDq*RW!=sl zeOpX&l8k3{zJDq+i;mw1xM{&L)o>7zdt9|-ddAo<(r$-m_iMjhk6XYEoHncqbNGH? z51b-X;@g4gQ9Qq09|#;hU=-#p5X-E5h)!hZRh6uwJY1c~%Avs$f!ut$QJ*{r3J`?c zR#%YL=Yqq6?Bbc3V)o7u3{rb;3$A7xkMnKf`Qc~`qk!NqpxRXgdG*Pq z*PJ$;ifsGMGqd8G;pbrOMrrva|W=BDc-_0t|T{%$bKg ztp0Gf1mVHG;2Z^*SI#Mq+rn#z9=AAgg?*zCGen<`<8U#`g-Tatv_}3`8j66TC(b4^L q%z$(MOXS~L