From 862797db81bb6d166285bd80ccafddf948d0d961 Mon Sep 17 00:00:00 2001
From: Matt Barlin <33430774+matttyb80@users.noreply.github.com>
Date: Mon, 15 Oct 2018 12:53:04 -0400
Subject: [PATCH] Environment Cleanup

---
 .gitignore                                    |   7 +-
 .idea/vcs.xml                                 |   6 ++
 engine/.ipynb_checkpoints/run-checkpoint.py   |  21 +++++
 engine/__pycache__/__init__.cpython-36.pyc    | Bin 140 -> 146 bytes
 engine/__pycache__/__init__.cpython-37.pyc    | Bin 0 -> 150 bytes
 .../configProcessor.cpython-36.pyc            | Bin 720 -> 726 bytes
 .../configProcessor.cpython-37.pyc            | Bin 0 -> 730 bytes
 .../mechanismExecutor.cpython-36.pyc          | Bin 2492 -> 2498 bytes
 .../mechanismExecutor.cpython-37.pyc          | Bin 0 -> 2467 bytes
 engine/__pycache__/run.cpython-36.pyc         | Bin 828 -> 763 bytes
 engine/__pycache__/run.cpython-37.pyc         | Bin 0 -> 767 bytes
 engine/__pycache__/utils.cpython-36.pyc       | Bin 2741 -> 2747 bytes
 engine/__pycache__/utils.cpython-37.pyc       | Bin 0 -> 2751 bytes
 engine/run.py                                 |   9 +-
 .../TestNotebook-checkpoint.ipynb             |  42 ++++++++++
 .../.ipynb_checkpoints/test-checkpoint.ipynb  |  55 +++++++++++++
 notebooks/CAD_Engine.ipynb                    |  12 +--
 notebooks/TestNotebook.ipynb                  |   6 +-
 notebooks/test.ipynb                          |  77 ++++++++++++++++++
 19 files changed, 222 insertions(+), 13 deletions(-)
 create mode 100644 .idea/vcs.xml
 create mode 100644 engine/.ipynb_checkpoints/run-checkpoint.py
 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
 create mode 100644 notebooks/.ipynb_checkpoints/TestNotebook-checkpoint.ipynb
 create mode 100644 notebooks/.ipynb_checkpoints/test-checkpoint.ipynb
 create mode 100644 notebooks/test.ipynb

diff --git a/.gitignore b/.gitignore
index 50bf771..cee0b3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
-
 .ipynb_checkpoints/*
 .DS_Store
+.idea
+engine/__pycache__
+engine/.ipynb_checkpoints
+notebooks/.ipynb_checkpoints
+ui/__pycache__
+SimCAD.egg-info
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/engine/.ipynb_checkpoints/run-checkpoint.py b/engine/.ipynb_checkpoints/run-checkpoint.py
new file mode 100644
index 0000000..1adcca7
--- /dev/null
+++ b/engine/.ipynb_checkpoints/run-checkpoint.py
@@ -0,0 +1,21 @@
+from ui.config import state_dict, mechanisms, exogenous_states, env_processes, sim_config
+from engine.configProcessor import generate_config
+from engine.mechanismExecutor import simulation
+from engine.utils import flatten
+
+#from tabulate import tabulate
+import pandas as pd
+
+def main():
+    states_list = [state_dict]
+    configs = generate_config(mechanisms, exogenous_states)
+    # p = pipeline(states_list, configs, env_processes, range(10))
+    N = sim_config['N']
+    r = range(5)
+    # Dimensions: N x r x mechs
+    s = simulation(states_list, configs, env_processes, r, N)
+    result = pd.DataFrame(flatten(s))
+    print('Test')
+#    print(tabulate(result, headers='keys', tablefmt='psql'))
+# remove print and tabulate functions, so it returns a dataframe
+    return result
\ No newline at end of file
diff --git a/engine/__pycache__/__init__.cpython-36.pyc b/engine/__pycache__/__init__.cpython-36.pyc
index cb34c91f693a2544a37e22aa56cf0fa42d92821d..9fe048548927dd1802b900d01458dade5fdaab18 100644
GIT binary patch
delta 72
zcmeBSoW#g(%*)Fqvts{5b_-K`XRDad;?$zznB1hqqMVq3%H)j1qTGO@{H)aElHwSb
b%(S%1K;7WXTxUm@nAE)V%)Hc?iFtAWTQ?aU

delta 93
zcmbQl*u%(f%*)H=eQ(c1b_-ui{m|mnqGJ85to)SJ;*v`JfTH}Y)Z~(4eV5F%w8}u;
v;LKcSM;HCny!6bxRQ>q)%)HE!_;|g7%3B;Zx%nxjIjMGx3=9m#K+FIDy*M5a

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-36.pyc b/engine/__pycache__/configProcessor.cpython-36.pyc
index 81634434ce7efe4877b292c212d848831e107643..b575caf1203a6b57feb1989f3f14bdea6b3c2e13 100644
GIT binary patch
delta 76
zcmcb>dX1ISn3tDJX2t&KvlBTVnYuY!#e^2878S?jCM6c-!~|3(XCxNo1{CFIr6!jY
g$GBvsrBw#%2506vJG#WA=A~!mrN(TQV%)|E05QiK@&Et;

delta 70
zcmcb{dV!VGn3tDJ?Dd}LgA+L)={x9$7N-^!>t|)<r=%8_RO$y5<!7ZPmlW%}WTvH6
a2I>Z9<~lpN=%?nTXXd5qZ&qO3#s~n1QyCcm

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<HJt|@XH*w!fErG6x%c<
zkg!X54+$TE@5IJt#3A)=R}5&gW+_Wp!Y`W@Y}hsX3M)1s{Q?zKd<|=!^2AA8Yv;9n
z#aHZtFHPjeFs3rBm=rGQ15(_hX$njD*uG#JSh6l$@e_9h-$5CFpKIQGsT){DmGGI~
z6=&sC6y+Sp7DDTF^XBkX_zs1_P);J1hewO}I8yRRm7hdhVK~Urbn*7ZD3gc#gHROH
ztPo*b7HKvmpI9K4syAEQwEB65Rb0whU<g1{st4!KD5X$T!MMKD>*r-0<rvUr>wnjt
zDf_Oy=X5Z9Eul+1ccJEG1CRcoe2b>`1%}$IJJUN8aU7jyr9xuCHHox$8s&3=L<Exr
zHU*B;c@d*-NkJVK8OoXw)u6<>+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}n74<PE<8ehjRf

literal 0
HcmV?d00001

diff --git a/engine/__pycache__/mechanismExecutor.cpython-36.pyc b/engine/__pycache__/mechanismExecutor.cpython-36.pyc
index 9f7ecd36fbf58a4a870dc6be0ac78d13b8961500..9bbf83771e2fcc3ef93b92c5d421721df510b14e 100644
GIT binary patch
delta 77
zcmdlZd`Otnn3tDJX2t&Kf{mQKjHVvWRxzQ)sYS&xxk-sdIWYm1$r*`7xdBD_S*gh-
g#W60KX=#;#y1|*b&W<iIsd?#{d8sj*T^Y+c0P_eM$^ZZW

delta 71
zcmX>kyhoVRn3tD}<IkRGrH!1tjQURcp~b01#rj!U`6;QzC6)RCMfq8&$tA`5E}3a*
am4Uj!nYqr6F8Zl?>6v+{`kTEO%Q*l+C>OE-

diff --git a/engine/__pycache__/mechanismExecutor.cpython-37.pyc b/engine/__pycache__/mechanismExecutor.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1a9ad371b9617e658a282a7318b9e7d6eb8624eb
GIT binary patch
literal 2467
zcmZuzTW{P%6rLGh*6ZDDLrUp|h$1AQi=gzaRTV{$1PKs|3KeR#q^ul|ck9Nt%y_G$
zvh$Kk%_IDS^bLLm|HH35<uCLFzBBG7ZNSl-x%kZNobUV2an=?Ve1>QFkH3B?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<3E8<WfBMD(g@ja-3&vh8!OBP)}PgqUk<N#g4=gKVpX#9Qo#-^s{_2v>L7(p?_#>
zT}FkXUwZZJ`rWOcb)@uGx*e!w>)w9&I8f<5l|PBXQg3a<lga*%U)+z=^{+R!qHG#x
z(N-G4DT{Ub&0ZAF%3R$n_8V^{3DRvDtkSs}jXk?Qjmq^r`6<$~q|`T8k~|C&y^2BW
z2?XpU)@5U*K{2#d7n_tvrUTPBlUWvObI+k=mfDxbjreR9-ueN;Kogscs|&Di;p$>x
z9ZfI8l<b(7q7;|eOI}(Pt9T`VtZk6xo45*5Fmfh&B9)?Z&4K^9q8iXE3b-}qQj56M
zTJ$)08t3Y}teBM)(fnSE7>9H?J#)Uzy;iZXcc<dV>?PY^k3O%h$|`xqXnx3dT;=1Q
z)>T%4f7}<NwqIep{sU;$P)&&LMEhEi42E{I5M@uth04Q7>qs}gE`u@}%Q!3z*o|Wr
z&POl^iXzz`&-c<<n($+Mz!$l?gi&bb7%ZTjV*48=CD1(NZ(559R=ahl_9|C$M9?9N
zwQlWGgovg~=-0iyYn4FkOLf2Mn{~hH9U}8~*B-D^RCeW8z7&Yu;t+Y|2!^?}Le_@$
zj;+dniOfCd9{30DL8tP7inDq051yu5#%Y9j)1v8;g2$8v?W!4qT@sHXicE}+3ml?M
z4i_3XH7-Vfqh5=mQRir|{hI1=tJWp#Zrswik2-NSrc@sd(ixBswv(uxd-<$vN4+G_
z<rseX_LEWHOyEni#>Fz^qX^z}6sap%qo306!Z5zfm&8E$u!~}e`@$2(<1_<Em?T4^
zv}YJdUfbXZ8mgVjAxvu*_*y{JHHf+fQFqE~R@u_I&1##}33hJPot8mZ$MERYUGQjw
z5f4mKCb?(3cJDrbZp{hEH1OeWDymrOJu(!Bx(ahbYeUgeK&wN)X@S;bQzJTIo=xJZ
zRus0PELQKsj1~<Wt<!6;r%@K^Sc3zoT{mvKbL48g&n6>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_&})7uo6<irKg8>3j7f!Q&u~B2L$jTDOC})lJ5xh@O7OrRo;N@NwFoMU=U%H-i{np
zk<OG?-epv$%Bi~0y|X(&hL9f`sHB?Z&%YS$S@85)PtfL^X&iVNssE4OL5`z>Y#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-36.pyc b/engine/__pycache__/run.cpython-36.pyc
index 34bd64a3883703e7ac0dac430b333dabbb06def1..5e550192b8921175bd9006dbd378d38bad085a38 100644
GIT binary patch
delta 371
zcmYjLu}T9$5Z%4YZ7wkv11eZ(6`KQ1V;6!534#`BOm!Z}db^1$cbju(4-5z?w6G2N
ziu{9ie#N#{{(?5{1%%8nkD2!#ym=?TUi&l%>VuEZn}&<f7uqPt?&o%3v}j+pqJR-r
zeMM1|dDkfP7jIAd!{pyi>{3p@^j|HHaQ~3GFBqfe(p(uDJpA^o7F9+Zbl6y~aA$66
z1FGqTq8V2;D;h6XLh6u2TcD}taGMIyQ8k&$v6z6WmmaJP2168wBGoITb}aeRO}cRb
zTtS@OQI*E|EV-vD%hmLOCmLcV#^c%J35YDAEaq||B#)0(Av^iZR5B`LnGY=s2oqd)
zeC#_d+{C`C_AD1}FXs;Q4auow6jWfjwXlxgfL$vXzn4u}k@7QaFDSo0z>Tt9-}wVB
CQCV34

delta 427
zcmYk0zfQw25XS8^Nt2Sa9RLZb8!Q=U1{e_nS|PzuQ56=mU}~qN<R7*p5vdXbtPEA&
zp%NoIyhv6iUI7;DN=UVJpYG0|e|Nvehq=Ayx{ZbXdA-m8_yQ|O*5F76znO2Jbz%oO
z5D-Aj$VE+3C)Nu<En<#<XU}JkJ07eofp7B&3pyD8V@#Q-=qb)+>A>EJaApRn5uF&X
zwP&c15@8N1IQTZCtJ3dj!I7Tvhse`V{f=Tn8Al2p(I6I{TSl<kL3SSte9CZ4nXUdA
z84DA^8Zs~6;nvfdYC={)UYU&YJQ8n!t;^=mzJJ9f(w|OKLb)jX3zkmlSa81|20=00
z9ffi4xbM?s5+>AVdD6{_N{?}vs7bsj1wa!vGz(f<8#W=^lpU{)>^$s_(<BHdtQ=~S
r^W`?k%y2?5XDw-3I+ts#$cB8Vtb;fuc|;GPthghk108iWM^5<z3nye@

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<jIB-}Yv8PaJRGQ2X)TAXz(T>!fh6jNo
z55bM6$d%K+0w<DoSa22Bu^rpr=jW?cj+|Wl`1x)bAoR;${t9-+Gk5frQxs8XkN^S#
z6D$G}h>(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_jmCZz5NegjY<PVyQf*D)Gv(ja2BB
zAHhbdk~^kS@9-}y?x@W!DpS2um0&8Hk~+nuDPppi+1NB(8<NamweqX9pe$$`E2jI#
zd`IezbN)WB&&ysjrAzU?Qcc<I9mPsG9zU|$=#uj7cK_+I<EpM`$>fepR;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-36.pyc b/engine/__pycache__/utils.cpython-36.pyc
index f5ade6fe0144a6b2d76cad5346d59e52615763fd..b98d7999c89c3ed06be6f26523365fe971fc7f19 100644
GIT binary patch
delta 77
zcmdlgx?7afn3tDJX2t$!&yAdcjHWiuRxzQ)sYS&xxk-sdIWYm1$r*`7xdBD_S*gh-
g#W60KX=#;#y1|*b&W<iIsd?#{d8sj*I~jF20rW!}%K!iX

delta 71
zcmdljx>c0Zn3tD}n`Ljb;6~0sMtw8=(BjmhV*RYF{FKz<l1lx6qWrAX<dR~2m&~-Z
a%0S)V%v@(j7yZ<{^vt|e{muQ1I-CFv6Bg9~

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#Ac<nk@T5@fH3R4VCs8A88imF2M07yhd5g?2!YqPU<mhQ!!U6&?W
zKP3{p@X&vdzQM2Hf9xwy`3rsGe6zkJZY9Q=>z<i&<~!dx<FDrCYK+R}U;q5_O@*<4
zF&P(=1`nvF$J9tBdB`HxVi9j~j=2a$WV8%DHbOJ9S{98>X`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<JZCvS5gI7IM-DLcHI2ya(}Z^m3l~mjRaLs7n~@ChskEAL
zwM64rOO2nm8qromzT5cvUgNuajeQR)Q6LM;;Dq#BYH~g_e`j5;{pG-ro`BEVV#tPE
z8qz#vLrY6o<WVQLAd`y|15!gfw{x?{SIC=9d+Os7L&n~MnpJAFj~9nLV`t>&KiEt0
zLcqf%kV0WY;iQ@BgK<rvU}(Xg6W6LT>vR(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(`BPMV<N(4em0l%NZZlppPklAsv?bnEG=#&ci7v$fhtsy9vkXJWPq42xjFL
z(TIqYo09)&tS}_?GfIXp@o<YhdVNjl9;HPk3gSWL(;)S|B$jE@)OlMW6)8AY;W=+s
z3Y$_k<?=GiY~jN;norOmC<^{s=;(hM8em9`@T&7=u0F*s#Gt1^qyhTLZ9vkTn6pL!
zLp<6f;?eVj+vL`XwNJANpIX((_YSoZRpt<Vc+)O;s_xJ^ty)(l^w4PIXY7W;5`Uf4
z>L3n1Rr<8g=-b5PMWOD}e2<*COg({wPAe>%+izUeS!SUG6j&A&S^nM95nEKdgV@WG
zBuq6m3jO$Jeym@7oj-MgQphtpL^TUa@L<jb>gbz{{;Wia9EARTpphcmBf{&#5sq1#
Ma}4@boLbHP57Un&3IG5A

literal 0
HcmV?d00001

diff --git a/engine/run.py b/engine/run.py
index ebdeef3..1adcca7 100644
--- a/engine/run.py
+++ b/engine/run.py
@@ -3,7 +3,7 @@ from engine.configProcessor import generate_config
 from engine.mechanismExecutor import simulation
 from engine.utils import flatten
 
-from tabulate import tabulate
+#from tabulate import tabulate
 import pandas as pd
 
 def main():
@@ -12,7 +12,10 @@ def main():
     # p = pipeline(states_list, configs, env_processes, range(10))
     N = sim_config['N']
     r = range(5)
-    # Dimentions: N x r x mechs
+    # Dimensions: N x r x mechs
     s = simulation(states_list, configs, env_processes, r, N)
     result = pd.DataFrame(flatten(s))
-    print(tabulate(result, headers='keys', tablefmt='psql'))
+    print('Test')
+#    print(tabulate(result, headers='keys', tablefmt='psql'))
+# remove print and tabulate functions, so it returns a dataframe
+    return result
\ No newline at end of file
diff --git a/notebooks/.ipynb_checkpoints/TestNotebook-checkpoint.ipynb b/notebooks/.ipynb_checkpoints/TestNotebook-checkpoint.ipynb
new file mode 100644
index 0000000..57d2504
--- /dev/null
+++ b/notebooks/.ipynb_checkpoints/TestNotebook-checkpoint.ipynb
@@ -0,0 +1,42 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import pandas as pd\n",
+    "assert pd.__version__ == '0.23.4'"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.7.0"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 2
+}
diff --git a/notebooks/.ipynb_checkpoints/test-checkpoint.ipynb b/notebooks/.ipynb_checkpoints/test-checkpoint.ipynb
new file mode 100644
index 0000000..a79181a
--- /dev/null
+++ b/notebooks/.ipynb_checkpoints/test-checkpoint.ipynb
@@ -0,0 +1,55 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "metadata": {},
+   "outputs": [
+    {
+     "ename": "ModuleNotFoundError",
+     "evalue": "No module named 'ui'",
+     "output_type": "error",
+     "traceback": [
+      "\u001b[1;31m---------------------------------------------------------------------------\u001b[0m",
+      "\u001b[1;31mModuleNotFoundError\u001b[0m                       Traceback (most recent call last)",
+      "\u001b[1;32m<ipython-input-1-a6e895c51fc0>\u001b[0m in \u001b[0;36m<module>\u001b[1;34m()\u001b[0m\n\u001b[1;32m----> 1\u001b[1;33m \u001b[1;32mfrom\u001b[0m \u001b[0mengine\u001b[0m \u001b[1;32mimport\u001b[0m \u001b[0mrun\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m      2\u001b[0m \u001b[0mrun\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mmain\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n",
+      "\u001b[1;32m~\\AppData\\Local\\Continuum\\anaconda3\\lib\\site-packages\\engine\\run.py\u001b[0m in \u001b[0;36m<module>\u001b[1;34m()\u001b[0m\n\u001b[1;32m----> 1\u001b[1;33m \u001b[1;32mfrom\u001b[0m \u001b[0mui\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mconfig\u001b[0m \u001b[1;32mimport\u001b[0m \u001b[0mstate_dict\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mmechanisms\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mexogenous_states\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0menv_processes\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0msim_config\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m      2\u001b[0m \u001b[1;32mfrom\u001b[0m \u001b[0mengine\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mconfigProcessor\u001b[0m \u001b[1;32mimport\u001b[0m \u001b[0mgenerate_config\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m      3\u001b[0m \u001b[1;32mfrom\u001b[0m \u001b[0mengine\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mmechanismExecutor\u001b[0m \u001b[1;32mimport\u001b[0m \u001b[0msimulation\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m      4\u001b[0m \u001b[1;32mfrom\u001b[0m \u001b[0mengine\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mutils\u001b[0m \u001b[1;32mimport\u001b[0m \u001b[0mflatten\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m      5\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n",
+      "\u001b[1;31mModuleNotFoundError\u001b[0m: No module named 'ui'"
+     ]
+    }
+   ],
+   "source": [
+    "from engine import run\n",
+    "run.main()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.6.5"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 1
+}
diff --git a/notebooks/CAD_Engine.ipynb b/notebooks/CAD_Engine.ipynb
index 988308e..fc51d07 100644
--- a/notebooks/CAD_Engine.ipynb
+++ b/notebooks/CAD_Engine.ipynb
@@ -1301,13 +1301,13 @@
     {
      "ename": "NameError",
      "evalue": "name 'non_numeric' is not defined",
+     "output_type": "error",
      "traceback": [
-      "\u001b[0;31m---------------------------------------------------------------\u001b[0m",
-      "\u001b[0;31mNameError\u001b[0m                     Traceback (most recent call last)",
-      "\u001b[0;32m<ipython-input-12-9786f8c4c4ba>\u001b[0m in \u001b[0;36m<module>\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"
+      "\u001b[1;31m---------------------------------------------------------------------------\u001b[0m",
+      "\u001b[1;31mNameError\u001b[0m                                 Traceback (most recent call last)",
+      "\u001b[1;32m<ipython-input-12-9786f8c4c4ba>\u001b[0m in \u001b[0;36m<module>\u001b[1;34m()\u001b[0m\n\u001b[0;32m      3\u001b[0m \u001b[0mstate_dict\u001b[0m \u001b[1;33m=\u001b[0m \u001b[1;33m{\u001b[0m\u001b[1;34m's1'\u001b[0m\u001b[1;33m:\u001b[0m \u001b[0mDecimal\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;34m'3323'\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m,\u001b[0m \u001b[1;34m's2'\u001b[0m\u001b[1;33m:\u001b[0m \u001b[0mDecimal\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;34m'2572'\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m,\u001b[0m \u001b[1;34m's3'\u001b[0m\u001b[1;33m:\u001b[0m \u001b[0mDecimal\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;34m'2.657'\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m,\u001b[0m \u001b[1;34m's4'\u001b[0m\u001b[1;33m:\u001b[0m \u001b[0mDecimal\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;34m'7.914'\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m,\u001b[0m \u001b[1;34m'timestamp'\u001b[0m\u001b[1;33m:\u001b[0m \u001b[1;34m'2018-10-01 15:16:26'\u001b[0m\u001b[1;33m,\u001b[0m \u001b[1;34m'mech_step'\u001b[0m\u001b[1;33m:\u001b[0m \u001b[1;36m1\u001b[0m\u001b[1;33m,\u001b[0m \u001b[1;34m'time_step'\u001b[0m\u001b[1;33m:\u001b[0m \u001b[1;36m2\u001b[0m\u001b[1;33m}\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m      4\u001b[0m \u001b[0mstate_dict\u001b[0m \u001b[1;33m=\u001b[0m \u001b[1;33m{\u001b[0m\u001b[0mk\u001b[0m\u001b[1;33m:\u001b[0m \u001b[0mv\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mquantize\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mTWOPLACES\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mROUND_DOWN\u001b[0m\u001b[1;33m)\u001b[0m \u001b[1;32mfor\u001b[0m \u001b[0mk\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mv\u001b[0m \u001b[1;32min\u001b[0m \u001b[0mstate_dict\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mitems\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;33m)\u001b[0m \u001b[1;32mif\u001b[0m \u001b[0mtype\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mv\u001b[0m\u001b[1;33m)\u001b[0m \u001b[1;33m==\u001b[0m \u001b[0mDecimal\u001b[0m\u001b[1;33m}\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m----> 5\u001b[1;33m \u001b[0mstate_dict\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mupdate\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mnon_numeric\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m      6\u001b[0m \u001b[0mstate_dict\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n",
+      "\u001b[1;31mNameError\u001b[0m: name 'non_numeric' is not defined"
+     ]
     }
    ],
    "source": [
diff --git a/notebooks/TestNotebook.ipynb b/notebooks/TestNotebook.ipynb
index a02a274..51d7dc7 100644
--- a/notebooks/TestNotebook.ipynb
+++ b/notebooks/TestNotebook.ipynb
@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -13,9 +13,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "DiffyQ-SimCAD Env",
+   "display_name": "Python 3",
    "language": "python",
-   "name": "diffyq-simcad"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
diff --git a/notebooks/test.ipynb b/notebooks/test.ipynb
new file mode 100644
index 0000000..48c1228
--- /dev/null
+++ b/notebooks/test.ipynb
@@ -0,0 +1,77 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 5,
+   "metadata": {
+    "scrolled": false
+   },
+   "outputs": [
+    {
+     "ename": "ImportError",
+     "evalue": "cannot import name 'run'",
+     "output_type": "error",
+     "traceback": [
+      "\u001b[1;31m---------------------------------------------------------------------------\u001b[0m",
+      "\u001b[1;31mImportError\u001b[0m                               Traceback (most recent call last)",
+      "\u001b[1;32m<ipython-input-5-a6e895c51fc0>\u001b[0m in \u001b[0;36m<module>\u001b[1;34m()\u001b[0m\n\u001b[1;32m----> 1\u001b[1;33m \u001b[1;32mfrom\u001b[0m \u001b[0mengine\u001b[0m \u001b[1;32mimport\u001b[0m \u001b[0mrun\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m      2\u001b[0m \u001b[0mrun\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mmain\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n",
+      "\u001b[1;31mImportError\u001b[0m: cannot import name 'run'"
+     ]
+    }
+   ],
+   "source": [
+    "from engine import run\n",
+    "run.main()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.6.5"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 2
+}