From b767792c007de87d03da63e4fc1dde7a9f8887ab Mon Sep 17 00:00:00 2001 From: "Joshua E. Jodesty" Date: Wed, 10 Oct 2018 19:54:31 -0400 Subject: [PATCH] packaging pt 2 --- engine/__pycache__/__init__.cpython-36.pyc | Bin 0 -> 140 bytes .../__pycache__/configProcessor.cpython-36.pyc | Bin 0 -> 720 bytes .../__pycache__/mechanismExecutor.cpython-36.pyc | Bin 0 -> 2492 bytes engine/__pycache__/run.cpython-36.pyc | Bin 0 -> 828 bytes engine/__pycache__/utils.cpython-36.pyc | Bin 0 -> 2741 bytes engine/run.py | 4 +++- engine/utils.py | 3 +++ notebooks/CAD_Engine.ipynb | 4 ++-- ui/test.py => test.py | 0 ui/config.py | 15 ++++++++------- 10 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 engine/__pycache__/__init__.cpython-36.pyc create mode 100644 engine/__pycache__/configProcessor.cpython-36.pyc create mode 100644 engine/__pycache__/mechanismExecutor.cpython-36.pyc create mode 100644 engine/__pycache__/run.cpython-36.pyc create mode 100644 engine/__pycache__/utils.cpython-36.pyc rename ui/test.py => test.py (100%) diff --git a/engine/__pycache__/__init__.cpython-36.pyc b/engine/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..cb34c91f693a2544a37e22aa56cf0fa42d92821d GIT binary patch literal 140 zcmXr!<>m6ewQb`dL}| zDXGOJmHGii`B|ySCB^zKnQ3X2fx5w&xz3I*`l)&8nR%)D@$s2?nI-Y@dIgoYIBatB PQ%ZAE?LbBr12F>t)U_e) literal 0 HcmV?d00001 diff --git a/engine/__pycache__/configProcessor.cpython-36.pyc b/engine/__pycache__/configProcessor.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..81634434ce7efe4877b292c212d848831e107643 GIT binary patch literal 720 zcmaJ1OT<^iu1y!y{|mt{Bs1%Q7aI;1}&0c5Kczuwf&zA5cThx3J|I7oPB)pEv#u->`GO zwwYVwl-h8^mhj1*kl|CBX0V1Y-E+2sHS5Dq{>`7jC1@KTa>EC2ObhFzmLW6y^1GVJ zN-c5fAaqeThtWrr8l(AK35oS8`k>WZrZq;RJj+%`uP1r={@o~&)hw@Ml&UJrXB3l4 zM5PCd)lFwu+_iZ5)oF>ImB1ynX0^1U&*|JK}bV`|? zBvp=OqlLD&X4=CdDUU@G2lR)wDPRZe?8SfRH1VOQ_iO_Ht6ZV+%49)Ej}UE>n4poN zxf@U02jm=0h%5c*pBh$4_tJnpXPmySzwhbCgpNbzR+sI;bjzSrVp+)8ou_E{1HEjh AV*mgE literal 0 HcmV?d00001 diff --git a/engine/__pycache__/mechanismExecutor.cpython-36.pyc b/engine/__pycache__/mechanismExecutor.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..9f7ecd36fbf58a4a870dc6be0ac78d13b8961500 GIT binary patch literal 2492 zcmZuzTW{P%6rLGh*6Y1AY$`H|3ZZX-x=rDP_O39eLUy;zH_`^^m@Mc&tJdX@)`S^oqGh@ zU!my7Fp^20u#}HDr?yB$YK^Sa9@*$y(tg24j&!7p+LbNop>D~x^ig}VBfF^EvM2kf zeR)Z)pzg?b9Zit^O}!Co2Kwk?VwmF`Z`R(3jUJ4mr&f zdeiI8wV!pQ^xABe%SaaoYd@%b7KMdg+lnWXgC9SC7^e@u-dc;YX`DrCX%s#UvRJ3z z>__3E$km!P;O zU_P`}8=I6zrUg?wlSLM4bHkx!hMGyU4E(XW_r?pzdrdqtt}em8fvAgt2PpamOu=Tn z5QVtPmb|b^R`OB+Q`=z5w{aB$f8nb1jv{qRO=5b%N zntGk>`H!GdLoy+{8y#px0vOtLFUp>c=PC~)ts`Cgx(JGBEaR{+VAqZrxadJYn9q}g z@yT8~OA~&K_xTD}SI`PgAB`T$DYn0(Qvgk%dd^x*u*$7kl~=mbfd?(=uF_b$^2tMZ z(p{yNFYWJ4oksn-n}I{Wqhg`RZRhiUJNilZ+IRWxTCjAQEMA z*sI;tEH+9Ubs9X4PDlNnW75ZsZU^*Iw=l~`tvDM~xR3hj0vrT8N!0Ycd{H#5P7>&1 zjCJ|WY}7R!tfgM6)HRIJtMt1tjNjk`(HB1KiWqQTc*3kWjRle@3DRip zIU15zHrRriDyKwNTLo7@+5)z&!PYg{x>H`U(w5>Lt8CIKc)DA)z$G_~f)z08Rc$b8 zgBuT=QcSsLyY{|(1O=ND5OZM0-B!emdXEhGp;pNl3PeKzjSl^~0a}kuwrGWUHi@TN zk=yD6G8ELK6~jie=osv2ltnt$-~hVUwcG3*xf=7?WaRFc`U0eNdk2|ncZ|&+;ap93 zVBF>&egp0bj{{!(x&-bm%$)a=`x{4~fPfhQ*?%`BT$(B-(Yw-7Y zU#L$p5|W4XbWl#wKSF29Drf(YP+pQ;72zxSu27GU(~e2{260b1zltU?8PT_7Yn2({ zx2C-Gt|D2LPT7X|oxMK7#KUZRmH4C-=AV2(nzOLdYgU3g2UPfP75Y##@;5O+cpBxO z8L;N4Ae%>D(d(pA~=8zb=% z{7AN}<`-CDr`0fyd~$s6$$dG`#^dxR`TgmJAoK^_TlS1z*=;^sV2ELf6sA}aN|Z-E zOc-j~CZ9Z54w8nb`7zlU=vd7>v{21*C z1dJT;-h;419fqj$I&uj1KE#^@(#}6%>kVK8Sr;&m`7HS99k3gMZ8}`^cySxp@V)<) z?+o>~=9|n3jjnjfxHi<4CizN1KGyC+bmYKu;5%@2_JJtqmZwWvX-mggZI9cQ?d!T^nqBQkpAgjo03^r7aamGBGc2iExadGXQMdWy}aVcfv3 zc&D2UufP;@v0ClkKfM&{;`O}X^;*=t&~1Ib-SxgIMeVYii3Nm1oRS#FWQHeLpIJ*j zqe&~ykNJ-c{_oATGBilfj$uzao7!D@qlaP8M;(Juf1 literal 0 HcmV?d00001 diff --git a/engine/__pycache__/utils.cpython-36.pyc b/engine/__pycache__/utils.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..f5ade6fe0144a6b2d76cad5346d59e52615763fd GIT binary patch literal 2741 zcmai0TW=dh6rP#AcT5>Iy3R4VCTtT_0s;Z*q0U;5AB0v}_Yr8Xc?C!;#U6&?W zKP3{p@X(*ZkKm8&D^K|ged2txv7NY;SZilyXU@zy=R4myjYTeATF>gw>_hf9(=G`#twQYGX;;$Gldzv=h276oWL8Y` z>WkKosnTg{Fi50Iv*XtHIvJ=SOI!Q>Zuj_y-NSzL=w+xgYw`6X`$LyB{WjAEp>g1WSW>!NZvWx=I@hZ?estMKes-sR?i@ z9`x{g3Q@)~p0k{v3Ih>8An0x5pcVN;`rzHdfvf4fs!BKXGm;@Dl~yyZS84oeweibt zBie1q_Zr{aYkYUFaTq`)9>~Hnz@L6gP0q*mAFRtwq&yhX6NuJtV$8-|TGBpaW5-B1 z6iY96Ad`zz3sPe@cXPYP*C~!ocNSfE2{ms)%?33lx+`Ozu>nQ+Pj)I^3dFVqQfO=_ zyfo88aIGmc3@!KzVp&yYoo=EdKPv$M%(_O+BE6Gn-JFoMqy4z2-W0O{KH~uv(3j%< zfSR0*truIlmGh@ezmr=(5s~Rjd`a`q+@C4?$UA;e+G-b0ni1~{OU1HqOj@)n!ANTr zUswpXmTXw=T(xT%Dm`i#w|R}b{N&bEftlfRJEw^=A&`OgZ92(7yM)9UFanle29_I4 zyO%K)GHY^uoi@(FiKz=XOHV5r$Ln=8h@siku50z2(oA)ZlrQxr&CjMXzh5TAM1x6* zrK>J3(3TYO0|r~dbGNwOp|7cjSE>k-C!+|R5<@o-2XSx?0V0MKs+bhvywa5!?zPZQ zvra#j>IEz}Zc%o;OXDk<2uhetyhelkLQzh1mh^6x>huj-BR$wm#Du!SO}gDwy%z2z zO>=$1r$ZFU)HaDuRKHK-D-4_#frqq`vjNLRsd(FrHmKrnQ<{vel9%aiF!HIbzbeZG zGH`5VBDXFo>p6&VUKYx>8zW)DV)aQfie(31NDP@o8hV>{Vd=Qnw!-B1wtdv^9nrU% zFEARp@eaKuW5o_%;dO3iryv5rsV4xjtoUO=F%zb&S!LayBp-TMYU(~>1F@$<*K@ic z%FWaR`Ae4t0*=>gg1Q_6lZ@mVisvX`s_w@$k1S^=cUAnnGt@~iOEAo&nHqK|WWAo! zvz18+FVny(>K775yzoXt5W3SXY;2#?Tdd5V`yq@#Tp0JbElzI!zbV8vRL`cRZ&9Z| zLIYpsb$OGc8nl=K7}DYBPpCgf-~yb22h|iN7_Q?uQ-{s1Gj?)^XhcNHZOQ+#))|WW zfQq3ZmN=k$*OvZqT2!KbJjxUeQWYezOq;f;+Zv@vBd{75d9zZuRI;g-msMsL3wvl< zXpj^Ie=T*)e+&aKq%QEP^EIwN#V+JvU_hh+`l&Y{X->@9q=X?J?GW+kdV)8(bLt$@ z*OX7~YNUcAqePcA#2nsq3!dsbbWXe0)d^iR#`rnAp|Hf?6ty~tLsykK?Q>e2n!F

v`oep)$S+`vLp#pLyf{*{+Wu+jc@9w yDNq`9#-ylWK?xqrxkMe~$;F?QD3PO3JpdXhsy#BiE\u001b[0m in \u001b[0;36m\u001b[0;34m()\u001b[0m\n\u001b[1;32m 3\u001b[0m \u001b[0mstate_dict\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0;34m{\u001b[0m\u001b[0;34m's1'\u001b[0m\u001b[0;34m:\u001b[0m \u001b[0mDecimal\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m'3323'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m's2'\u001b[0m\u001b[0;34m:\u001b[0m \u001b[0mDecimal\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m'2572'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m's3'\u001b[0m\u001b[0;34m:\u001b[0m \u001b[0mDecimal\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m'2.657'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m's4'\u001b[0m\u001b[0;34m:\u001b[0m \u001b[0mDecimal\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m'7.914'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m'timestamp'\u001b[0m\u001b[0;34m:\u001b[0m \u001b[0;34m'2018-10-01 15:16:26'\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m'mech_step'\u001b[0m\u001b[0;34m:\u001b[0m \u001b[0;36m1\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m'time_step'\u001b[0m\u001b[0;34m:\u001b[0m \u001b[0;36m2\u001b[0m\u001b[0;34m}\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 4\u001b[0m \u001b[0mstate_dict\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0;34m{\u001b[0m\u001b[0mk\u001b[0m\u001b[0;34m:\u001b[0m \u001b[0mv\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mquantize\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mTWOPLACES\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mROUND_DOWN\u001b[0m\u001b[0;34m)\u001b[0m \u001b[0;32mfor\u001b[0m \u001b[0mk\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mv\u001b[0m \u001b[0;32min\u001b[0m \u001b[0mstate_dict\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mitems\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m \u001b[0;32mif\u001b[0m \u001b[0mtype\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mv\u001b[0m\u001b[0;34m)\u001b[0m \u001b[0;34m==\u001b[0m \u001b[0mDecimal\u001b[0m\u001b[0;34m}\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 5\u001b[0;31m \u001b[0mstate_dict\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mupdate\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mnon_numeric\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 6\u001b[0m \u001b[0mstate_dict\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n", "\u001b[0;31mNameError\u001b[0m: name 'non_numeric' is not defined" - ] + ], + "output_type": "error" } ], "source": [ diff --git a/ui/test.py b/test.py similarity index 100% rename from ui/test.py rename to test.py diff --git a/ui/config.py b/ui/config.py index fcda562..0a23d3d 100644 --- a/ui/config.py +++ b/ui/config.py @@ -33,7 +33,6 @@ def s1m1(step, sL, s, _input): def s2m1(step, sL, s, _input): s['s2'] = s['s2'] + _input - def s1m2(step, sL, s, _input): s['s1'] = s['s1'] + _input def s2m2(step, sL, s, _input): @@ -51,16 +50,16 @@ def es3p1(step, sL, s, _input): s['s3'] = s['s3'] * bound_norm_random(seed['a'], proc_one_coef_A, proc_one_coef_B) def es4p2(step, sL, s, _input): s['s4'] = s['s4'] * bound_norm_random(seed['b'], proc_one_coef_A, proc_one_coef_B) -def es5p2(step, sL, s, _input): +def es5p2(step, sL, s, _input): # accept timedelta instead of timedelta params s['timestamp'] = ep_time_step(s, s['timestamp'], seconds=1) # Environment States def env_a(x): - return x + return 10 def env_b(x): - return x -def what_ever(x): - return x + 1 + return 10 +# def what_ever(x): +# return x + 1 # Genesis States state_dict = { @@ -82,10 +81,12 @@ env_processes = { "s4": env_proc('2018-10-01 15:16:25', env_b) } +# test return vs. non-return functions as lambdas +# test fully defined functions mechanisms = { "m1": { "behaviors": { - "b1": b1m1, + "b1": b1m1, # lambda step, sL, s: s['s1'] + 1, "b2": b2m1 }, "states": {