From 249dfc22e321bb3b54f70830a0105491ba7299db Mon Sep 17 00:00:00 2001 From: Michael Zargham Date: Thu, 18 Oct 2018 09:11:49 -0700 Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/staging' into mz-dead" This reverts commit 4113fb4202a1e2f88c5d542037e131de5c2b8216, reversing changes made to 8f35856348fd5f2e1c42db9826800af7ff73258b. --- engine/__pycache__/__init__.cpython-37.pyc | Bin 0 -> 150 bytes .../configProcessor.cpython-37.pyc | Bin 0 -> 730 bytes .../mechanismExecutor.cpython-37.pyc | Bin 0 -> 2467 bytes engine/__pycache__/run.cpython-37.pyc | Bin 0 -> 767 bytes engine/__pycache__/utils.cpython-37.pyc | Bin 0 -> 2751 bytes engine/mechanismExecutor.py | 8 +--- test.py | 4 +- ui/config.py | 36 +++++------------- 8 files changed, 12 insertions(+), 36 deletions(-) create mode 100644 engine/__pycache__/__init__.cpython-37.pyc create mode 100644 engine/__pycache__/configProcessor.cpython-37.pyc create mode 100644 engine/__pycache__/mechanismExecutor.cpython-37.pyc create mode 100644 engine/__pycache__/run.cpython-37.pyc create mode 100644 engine/__pycache__/utils.cpython-37.pyc diff --git a/engine/__pycache__/__init__.cpython-37.pyc b/engine/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..01f339da1890d73175d1a40483f8c4b544ec98b6 GIT binary patch literal 150 zcmZ?b<>g`k0+|*2qe1jz5CH>>K!yVl7qb9~6oz01O-8?!3`HPe1o6w>*(xTqIJKxa zCO0XuC?_VMGC3o$C^w)eKPxr4q&UVUGcBz$P&YU;*V)k}CN(cTGcPqJK0Y%qvm`!V Xub}c4hfQvNN@-529mwEfAZ7pnv>_y+ literal 0 HcmV?d00001 diff --git a/engine/__pycache__/configProcessor.cpython-37.pyc b/engine/__pycache__/configProcessor.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..faa49bef7f802f324d501b33f674b858dc619e2c GIT binary patch literal 730 zcmaJ<&2G~`5T0E-RvIOuf(jJG1#z+j5oZ)xw2e4MMG+S;iX3~L8oYM8<5W$Ro>D2{ z*f%IQcnY3?7uYLr(G#=lrXUW?YWC-w+4=c)4?3L|kUaVJ*r-0wnjt zDf_Oy=X5Z9Eul+1ccJEG1CRcoe2b>`1%}$IJJUN8aU7jyr9xuCHHox$8s&3=L+0P?6Nut2KB$}dtJ!I!k|I<$G?>lP81aLo#1!_k| zGeSCqC=*0`H4XI(Im&z^Yp7jp>U;m>FihJ22JA88G}`X2qwW(r^qF04w7;g?4rH0k La}n74QFkH3B?F#4M& z^G9It6`FnsBbnq0OZkX%8jD1v*2qfjk&U?}?dNRdNJqNpUD=Ty`i|^MAH64gvX8zi z7vuoFFE7YN^ga2`eKuS=!Rc(s8&5`25$47IP&6Vh8a@tfdWDC22hBp$*I-Ik@)zs{ ze<3E8L7(p?_#> zT}FkXUwZZJ`rWOcb)@uGx*e!w>)w9&I8f<5l|PBXQg3ax z9ZfI8l9H?J#)Uzy;iZXcc?PY^k3O%h$|`xqXnx3dT;=1Q z)>T%4f7}qs}gE`u@}%Q!3z*o|Wr z&POl^iXzz`&-c<Fz^qX^z}6sap%qo306!Z5zfm&8E$u!~}e`@$2(<1_x+w|ukZMxg2Pdj65{ut+K zx&z}j_wcvGUEy)Si@!dB`w`xqf=j@jroi`@m{N_PHwaz?4G`_UTQq-kqjmthEh&+y z=s1wQTe-h-qz4E%=9NnV-n|CUY=C8-m3a~;RgC*+hW07=d(^K{4J5nFeiys6fvXSj z-o!>9n47m6zIQItSN;ki8s=%SdWR09lU?>~xrmD>L4kj>QqLU?UEqfzSM+Tfdg?lj zKO|#R?@@w{b+p@D&~Z9Tf-=rCL!M!{>Cev}t6A3AkE1}IyIJGSU2fx4P1TiZj%%Rz z_&})7uo63j7f!Q&u~B2L$jTDOC})lJ5xh@O7OrRo;N@NwFoMU=U%H-i{np zkY#N!6 zhP`uOs!tG3V*@CyZqU%ePz}vu8N`YD6vNS_5=ZDb%BbFu)?2jCeUSV!HrB99Q{s`b z2S(Xf0In|vM%n61yxAP~8=I<@$;C!YGV?V&`wX5{$ToeAB#0QZ{S8XZJ*f2HpMx}) Zvm{z2Bs5jnK3^1`jX&4B=q-7@e*rj>5B>lE literal 0 HcmV?d00001 diff --git a/engine/__pycache__/run.cpython-37.pyc b/engine/__pycache__/run.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..cddb38d0cc73828568b4a2c190237b2c30321698 GIT binary patch literal 767 zcmYjO&5qPC435+P&dlye{0Jmopa=E=RtO!fh6jNo z55bM6$d%K+0w(OLA`$o)Zeo#;WU_-M6&cAUJ8W{XAdAV4nk8A$m?mEkIib;8RHQeqGAbgQ zYf~Avp}aOW7p(qJNv?&qYj)l4m~4B!nKHCpG5LAZskUZXGwmL7v8h|R<+}pxsmo=` zSGsligubZ^Z>38}w$3z6Ue>;`m-u*IxW9hwltDWfkpY8EaKIy&kitVWViQq(fH5%f zfCezh5DfSbjiE`uW+orP1AK!qG7B0U0MOv!g_jmCZz5NegjYfepR;pf}b$c6% zic8;Kubn~=Lyl8O@fuDb4b(m7D^5w)^Rs!58RI{A9?gW2+@A{{^WMx$Y}LdEd2kHg zZvW*qt9#?Zo)fY>hI_*sJ+l#am86wcE8oD6F=72r-E}^jJ`pYL8}=03O?!$S!P0+0 GivIxKPr}&% literal 0 HcmV?d00001 diff --git a/engine/__pycache__/utils.cpython-37.pyc b/engine/__pycache__/utils.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..414299384d0d6a773b089bd21c54584a656d75e3 GIT binary patch literal 2751 zcmai0TW=dh6rP#AczX`Ql`Ep1t$z9QFURn|^< z%aK=PomQ%HPR>(blM8Z@`YUotE>mBZ8}h2WMv`-KQ?AHW8qLeKeb&5wPWo9>6pnN= zKMNwisG^mAn7K_}RCawYh};mvzN@mp4Ly!6RL~2m52>c})JQJHDa+X|JK=P;u{RMl z=qs+g57BjMdL;IEdB}6V%N{#Jk&73`)B00$pZ(30O#)4$5ZiZJm2_|r25DB9LFPyL zi*8=+JiOQbA@x<-jt*QEwjUjNhpvhqspMDR%hL94(Cr?5zqKDk55L@P`*AOb{q`UW z!gRZT^s2UlL%k&G-?v~Au3@v|&7IJV4y1d3dnZghH%u`Y3zlZ_f`?NxRFyUs&Ul+X zi&mJbQ{&-O6!f_L1gMN&KiEt0 zLcqf%kV0WY;iQ@BgKvR(pxmgJSU{;8xIjUoC-5gW4qujXXzsYAF z?u-H~pf5#zpPHNvjpysRk@F`^-N=m}iOw_=pVRtN`zMM)x*gvuZ8Zxk&4~Sl;m5MD zba1pP-asio9$5&^mTXw)T()ZgDjjMVH+hZQ{P@;ofvMp$J15}-%i%!{?b|fa(9R=# z&KLp9F9ORorrnE}3Yj&zx<(sk;Kb4h&hn-eh2zx<8u(CeYSoqhj6%)t9Qv+QYqUOH z%G{s~h_MD867!d@c!jp4IvWxO>%y_ux!R<)$qg^%5(H019y%e0uEGyu?;HX|3?uYo zQiSu$t4wjPg>IU4f>`>`VY$8*MaMfdz7&a|gpS0kG{{Gaa-y@Ox>l-F*XbMS!Db>R z)D?Ep?WX=~?w(h)77#uiqDba%kmy+Tdo;epK=@Fren5kqov~b$iZ}FVmGb@ug~`w; zd70h@BcGV+i!xmx0*6K>a$}TV&q0jyGF`Up7y%O&O9#mymL1Fx7&3_z*xxh@L&d$8 z5hlO2%)_8}NOONS!6?MW4XPz$#U@|mb*@(@AOb*~I03QD`$IuK6FRLKW%h?43VK+o zvp;+Tu_r>+b9yGq&C~<=3r_|dj;c37T@Hb9L~;f1%}_vR-H&J;QO=I<`th?)UnSl& zz_5~Le!oL5>-Bs!{W4DBWf&MmeI%j93un*=p*!8e#P%7z#p3L_AHWFsg>i?Q;`rwO zn?h^@J(`BPMVL3n1Rr<8g=-b5PMWOD}e2<*COg({wPAe>%+izUeS!SUG6j&A&S^nM95nEKdgV@WG zBuq6m3jO$Jeym@7oj-MgQphtpL^TUa@Lgbz{{;Wia9EARTpphcmBf{sq1# Ma}4@boLbHP57Un&3IG5A literal 0 HcmV?d00001 diff --git a/engine/mechanismExecutor.py b/engine/mechanismExecutor.py index 37fdab4..b3fe0f3 100644 --- a/engine/mechanismExecutor.py +++ b/engine/mechanismExecutor.py @@ -21,12 +21,8 @@ def mech_step(m_step, sL, state_funcs, behavior_funcs, env_processes, t_step): _input = getBehaviorInput(m_step, sL, last_in_obj, behavior_funcs) - # OLD: no bueno! Mutation Bad - # for f in state_funcs: - # f(m_step, sL, last_mut_obj, _input) - - # New - last_mut_obj = dict([ f(m_step, sL, last_mut_obj, _input) for f in state_funcs ]) + for f in state_funcs: + f(m_step, sL, last_mut_obj, _input) apply_env_proc(env_processes, last_mut_obj, last_mut_obj['timestamp']) diff --git a/test.py b/test.py index 43e5f85..21e3670 100644 --- a/test.py +++ b/test.py @@ -1,4 +1,2 @@ from engine import run -from tabulate import tabulate -result = run.main() -print(tabulate(result, headers='keys', tablefmt='psql')) \ No newline at end of file +run.main() \ No newline at end of file diff --git a/ui/config.py b/ui/config.py index 956bfcd..0a23d3d 100644 --- a/ui/config.py +++ b/ui/config.py @@ -29,47 +29,29 @@ def b2m3(step, sL, s): # Internal States per Mechanism def s1m1(step, sL, s, _input): - y = 's1' - x = s['s1'] + _input - return (y, x) + s['s1'] = s['s1'] + _input def s2m1(step, sL, s, _input): - y = 's2' - x = s['s2'] + _input - return (y, x) + s['s2'] = s['s2'] + _input def s1m2(step, sL, s, _input): - y = 's1' - x = s['s1'] + _input - return (y, x) + s['s1'] = s['s1'] + _input def s2m2(step, sL, s, _input): - y = 's2' - x = s['s2'] + _input - return (y, x) + s['s2'] = s['s2'] + _input def s1m3(step, sL, s, _input): - y = 's1' - x = s['s1'] + _input - return (y, x) + s['s1'] = s['s1'] + _input def s2m3(step, sL, s, _input): - y = 's2' - x = s['s2'] + _input - return (y, x) + s['s2'] = s['s2'] + _input # Exogenous States proc_one_coef_A = 0.7 proc_one_coef_B = 1.3 def es3p1(step, sL, s, _input): - y = 's3' - x = s['s3'] * bound_norm_random(seed['a'], proc_one_coef_A, proc_one_coef_B) - return (y, x) + s['s3'] = s['s3'] * bound_norm_random(seed['a'], proc_one_coef_A, proc_one_coef_B) def es4p2(step, sL, s, _input): - y = 's4' - x = s['s4'] * bound_norm_random(seed['b'], proc_one_coef_A, proc_one_coef_B) - return (y, x) + s['s4'] = s['s4'] * bound_norm_random(seed['b'], proc_one_coef_A, proc_one_coef_B) def es5p2(step, sL, s, _input): # accept timedelta instead of timedelta params - y = 'timestamp' - x = ep_time_step(s, s['timestamp'], seconds=1) - return (y, x) + s['timestamp'] = ep_time_step(s, s['timestamp'], seconds=1) # Environment States def env_a(x):