From 4df2b8cdc95927b2154d1ef135868942d6e106b1 Mon Sep 17 00:00:00 2001 From: "Joshua E. Jodesty" Date: Thu, 18 Oct 2018 12:10:57 +0200 Subject: [PATCH] conncur mech step, per-se --- engine/__pycache__/__init__.cpython-36.pyc | Bin 146 -> 0 bytes engine/__pycache__/__init__.cpython-37.pyc | Bin 150 -> 0 bytes .../configProcessor.cpython-36.pyc | Bin 726 -> 0 bytes .../configProcessor.cpython-37.pyc | Bin 730 -> 0 bytes .../mechanismExecutor.cpython-36.pyc | Bin 2498 -> 0 bytes .../mechanismExecutor.cpython-37.pyc | Bin 2467 -> 0 bytes engine/__pycache__/run.cpython-36.pyc | Bin 763 -> 0 bytes engine/__pycache__/run.cpython-37.pyc | Bin 767 -> 0 bytes engine/__pycache__/utils.cpython-36.pyc | Bin 2747 -> 0 bytes engine/__pycache__/utils.cpython-37.pyc | Bin 2751 -> 0 bytes engine/mechanismExecutor.py | 8 +++- test.py | 4 +- ui/__pycache__/config.cpython-36.pyc | Bin 3245 -> 0 bytes ui/config.py | 36 +++++++++++++----- 14 files changed, 36 insertions(+), 12 deletions(-) delete mode 100644 engine/__pycache__/__init__.cpython-36.pyc delete mode 100644 engine/__pycache__/__init__.cpython-37.pyc delete mode 100644 engine/__pycache__/configProcessor.cpython-36.pyc delete mode 100644 engine/__pycache__/configProcessor.cpython-37.pyc delete mode 100644 engine/__pycache__/mechanismExecutor.cpython-36.pyc delete mode 100644 engine/__pycache__/mechanismExecutor.cpython-37.pyc delete mode 100644 engine/__pycache__/run.cpython-36.pyc delete mode 100644 engine/__pycache__/run.cpython-37.pyc delete mode 100644 engine/__pycache__/utils.cpython-36.pyc delete mode 100644 engine/__pycache__/utils.cpython-37.pyc delete mode 100644 ui/__pycache__/config.cpython-36.pyc diff --git a/engine/__pycache__/__init__.cpython-36.pyc b/engine/__pycache__/__init__.cpython-36.pyc deleted file mode 100644 index 9fe048548927dd1802b900d01458dade5fdaab18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmXr!<>iuDu|Jvt2p)q77+?f49Dul(1xTbY1T$zd`mJOr0tq9CU-r&cF`>n&Ma40> zNr^={F#(my8Hq)?0Y&*)smUe9F)o>DX_bMx!I`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+ diff --git a/engine/__pycache__/configProcessor.cpython-36.pyc b/engine/__pycache__/configProcessor.cpython-36.pyc deleted file mode 100644 index b575caf1203a6b57feb1989f3f14bdea6b3c2e13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 726 zcmaJ-ClGq6_1WQ(wXRl-XtQNG%UH%Q+BNLhG26g~jmW-24K?4wmghY4GT-@mEGose);9W-u&Onv@vP=9+)go-O;P zy=U}e^;$!pbnZi=%MKp?Mfo+FyBiprpy|x)&BRf1S}2XAf^QR<;4~?h0!aua32Y0T z=F2KY(~*KYt_qZmBHG@aX%EXp&axy5=nrjCz#g!(C;w@u;fJ2yvjP0iVui+&$%2p` zA=(BpK_f$RL!P$J$T=E{OMT~`99Bv9-he$~oW8EV@9DdQjzi{F7wy(`)qzymvJ{a! HPi*)D?rf_( diff --git a/engine/__pycache__/configProcessor.cpython-37.pyc b/engine/__pycache__/configProcessor.cpython-37.pyc deleted file mode 100644 index faa49bef7f802f324d501b33f674b858dc619e2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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}n747nn)uJqA+vM2lKyK+Ge z(EIX|TtwfK?>u6|rPr{|hP?4)6cu4!91KMx@}lA6(55Xs)H`Svn!XNEvXZ}IulOr5 zu_Tw`rB_*VG3T&nZH62g^iWSnFQe%`M8%H85kF#c3yOU6PkJq%46TOiM(7_KTbEIx z=uL0FTfevUvyPPBO1A@*Y&|##p9Ly?pz@t4EcMn#JeeH)^u?n%UH@idE6S#E7Hy>w zl(JZ--|k1@tjyJ|;-K+XlOWxe!5Z1sXzay}X;iM~$-_v`l2YGVP4X~E^cn`OCJ?Zb zSeK2J2F1`;T^v##i4H{LOlDcA%{_;fS!y?p8dzk_!dovO3^cLHxVi-S7OpN9*3t9| zM9Fq|DN1pb&3S26tm2gbvbI5%Z{jLM!N{59iByX08iW72q8iW^Iot|!sYP7se)KGO z9_Q-&teBPL(aF6QF%HQ%J!F`gxz`#7`*$n8!{%&*J^j44Dy!rbqxqcgy2{5rtz}k$ zf7}a%e2<5 zeew|AbP4^sw|~77@O`Q7SADbYSG_qhZ}0wNR*K55{K}UCo?9G2UO9qcZmp8EA-x@| z^5@9h!|tJf=pJ?|52$oDUsHxO-7-!i_?s3@mm+vfS0!C`vo1mi1wNeqM!xhR&nFFav1PIG}m zlmgPk+zSjOuWhh}XsVqGwQU((0ci`^x&~X`pJFK=TPQladx&tn`VHB)@ zQLpZTQ5)QN;FNO8Jv+5`?=d3SSU}E!8Fy0=GwMAO%ga^!04XOoe;ZTbt4Hr;Jhs@*XT ze+;{t?!dUsJ^YrqD?AQ(@#_<~A7SqlTmtqq8GgXT6m2-YLGZ$9fN1aEruoyGwFB5~ zX#+kgKMoSWt=wNZ5(Nb8@XDo7-n$OaY=GsQ6?_U#svD2c4DD0!_q1Q5E=YEj{Vw+C z0B>=n>O`NKTelm&f5Fo?{wg6F=4r8ZmyD5Rm%Ugi;vz~=>d)8g6UEl-F-hdUdY@k5 zsT(x@kc0_+kMeD-qrK*mj?-BZlyROJ1`W+k|KufOHOm_NSro_%*K52Jl{>Jisn}8p zat;0-9|-jsRzmWSo*vpM`bU^dS?%l}63TN5S4H?rzAMy|?|`A_?;=QysIcyl~Z*Q{LbD0Y2snGyG(pi3G+`rAgwKEdaWk7b3ldvzkxm!ZTOoU zAUsXvp9!$$s34n0#?4{x0>J7M9BFKTr`1gwS{SOKSuBG%QJ-Qsx>CY~j-!kU5hX#( zz=dy?f5y;#oYIt$6!HTT^49>kF9s&$)tA`W9QGTV%9%;hMocpE!94p?o|VovuT7W` mS?2gTn$10^CgJ}>n#)-dtq~lWN^hSp3eU#R^)7o$UhiK!>=HBp diff --git a/engine/__pycache__/mechanismExecutor.cpython-37.pyc b/engine/__pycache__/mechanismExecutor.cpython-37.pyc deleted file mode 100644 index 1a9ad371b9617e658a282a7318b9e7d6eb8624eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2467 zcmZuzTW{P%6rLGh*6ZDDLrUp|h$1AQi=gzaRTV{$1PKs|3KeR#q^ul|ck9Nt%y_G$ zvh$Kk%_IDS^bLLm|HH35QFkH3B?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 diff --git a/engine/__pycache__/run.cpython-36.pyc b/engine/__pycache__/run.cpython-36.pyc deleted file mode 100644 index 5e550192b8921175bd9006dbd378d38bad085a38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 763 zcmYjO&2H2%5cW9#+1+*}egqOPkORGNs}QP0;lQCnq9+q+Wn%B*Ds~pzL0u_(T3&{S z;Koz<%Biow2|HPpI`Vij^Lb{z X^77a3&+`bOKj^{2-oNnMTzkV1gBD33AThx* zB9V+qEEAGI$l*4X8OcUJYI9kTV)Wy-lru6L{iL0f1xs1>1CbM!d_q-z=PRQsaiy`; z@)Z+}b*1FZSE_`O#x416x8bVm&1ys#x8UmgYOA}38^eviDCDZ?)LLvRaHk&2b*OY7 z3V^<)R&>e(vbA?DS65AF99DYVZ~bXLcw^B9_Q-<8Hag%v*qFg{w8u7K_yGIJrUM$l zW}B);axR&yOR)mboJZKUI1!U!(W zRBgDci&!mts2T|t~NsPTKDQ~yK}LmLWTBb z=?#JuN}NNEmv91kq@Va$bxMj}oK15~9RJe`Y(|dc=~VcL`#3#fr$;@=vt#o9_21p{ zrnf#FG$He2y0@Y=lN#xkDn^Z7ga%=Zk?RBV*vDM{T6U~&`5W+mCP?%G=HZKS{0|@I B!gc@v diff --git a/engine/__pycache__/run.cpython-37.pyc b/engine/__pycache__/run.cpython-37.pyc deleted file mode 100644 index cddb38d0cc73828568b4a2c190237b2c30321698..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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}&% diff --git a/engine/__pycache__/utils.cpython-36.pyc b/engine/__pycache__/utils.cpython-36.pyc deleted file mode 100644 index b98d7999c89c3ed06be6f26523365fe971fc7f19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2747 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 Ma}4@boLbHP57Un&3IG5A diff --git a/engine/mechanismExecutor.py b/engine/mechanismExecutor.py index b3fe0f3..37fdab4 100644 --- a/engine/mechanismExecutor.py +++ b/engine/mechanismExecutor.py @@ -21,8 +21,12 @@ def mech_step(m_step, sL, state_funcs, behavior_funcs, env_processes, t_step): _input = getBehaviorInput(m_step, sL, last_in_obj, behavior_funcs) - for f in state_funcs: - f(m_step, sL, last_mut_obj, _input) + # 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 ]) apply_env_proc(env_processes, last_mut_obj, last_mut_obj['timestamp']) diff --git a/test.py b/test.py index 21e3670..43e5f85 100644 --- a/test.py +++ b/test.py @@ -1,2 +1,4 @@ from engine import run -run.main() \ No newline at end of file +from tabulate import tabulate +result = run.main() +print(tabulate(result, headers='keys', tablefmt='psql')) \ No newline at end of file diff --git a/ui/__pycache__/config.cpython-36.pyc b/ui/__pycache__/config.cpython-36.pyc deleted file mode 100644 index 66450cbb60dfe66bb91997154518b07bdc19f1f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3245 zcmcgu&2HO95aupPNtP{J{*V7+Cw6|A#F0taX=)g8^K&eOwni`PL69_Sn}$gWyHpwn zMlUYVQ{TWZ(0Aw~v@gJGfdaYp&{IyGSy>M4s6gT(U14X2!_~|z_uHANmP*Bix4(Y( z(|}?8VPr-Q>x7+2 z_PLbHN{~Ob{2~-!;77wBgdz+gAA%t$Auqu&j36I|GK?Z0fiW0IUWN&nL_P{rFpYc+ zuE7lQahQcUAZ#4I!4ovza3Utzu~POr zWsQ_IQ`TyciUx67^BkudLUPQ3&EO$V8yJFFOSy6-q2d>c#M17#`Z8ro4x?6+x7EtG zN=Q{XIEX>0=j z$#J9~9G5KNY8{vk!7=3sDau4fiJV6#$M6xod7(>hd)_8c{)FD#(4+nIyiI;uZ(it; zhn}~oPwUMMtJgB#ra#6T;>r8SW2??)oXwCk3keP41YiwbI?yh7kIiWvCcgN)ZDl=pV^_;Y*j_upvz zy?r4L8<%Kc)7mbu6C+{3XN-g==7~9x1-Z`DRawNfh;hoOn5>0>bcE_cJ&r`Z6^q^a z)60ry?_G($7_o(_wp|bH_AUeg=D!BKE(hNQEN`MLmx-)&wU<(QzZ-*bt+%~(T;Gd} zAk{xE`hS8Styki}{MjV=EKgXqbbxBAN*ZBX=O~Byc_px9fpVCnO!L7XYoqNw$^_+5 zP*jj<5T~h6mvY!Kr72eHCJL6aSC{jGO$ENOiA#ICypQsS8kB_hz9ySn8Iy$13ntI| zf&#ud#%56W1ei{#A24MCncAzQt8!v-c zDnEyZo(P344i8EimiZlmT8exn<<9WvhqIJE_mij}02EvZ&ZDxs1}o1`)$DeFs0!jf{Lq!cBWh@4*z zNw-fD)FnYn5*#EQpro&y7WH=O5VVrCEMCQXB8oc-n?>4WTI#inLMePKhN89KhyoR& ztbz~|1@&kd!028|w^4dctZG9O(YY%z=q5sqhHx7@Pc_ZZREXY%VHM8=dOkq a>>TU<3KnOa;W{>)<1A-#R