Skip to content

Commit

Permalink
v0.14.0.1: 2nd Control Example
Browse files Browse the repository at this point in the history
  • Loading branch information
@AstusRush
AstusRush committed Nov 12, 2019
1 parent 97661c7 commit 02e4001
Show file tree
Hide file tree
Showing 3 changed files with 294 additions and 3 deletions.
6 changes: 3 additions & 3 deletions AMaDiA.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This Python file uses the following encoding: utf-8
Version = "0.14.0"
Version = "0.14.0.1"
Author = "Robin \'Astus\' Albers"
WindowTitle = "AMaDiA v"
WindowTitle+= Version
Expand Down Expand Up @@ -162,8 +162,8 @@ def __init__(self,MainApp, parent = None):
_translate = QtCore.QCoreApplication.translate
self.setWindowTitle(_translate("AMaDiA" , WindowTitle))

self.Tab_5_4_Dirty_Input.setPlaceholderText("Example:\n\nK_P = 5\nK_D = 0\nK_i = 0\n\nsys1 = tf([K_D,K_P,K_i],[1,1.33+K_D,1+K_P,K_i])")
self.Tab_5_4_Dirty_Input.setText("K_P = 5\nK_D = 0\nK_i = 0\n\nsys1 = tf([K_D,K_P,K_i],[1,1.33+K_D,1+K_P,K_i])")
self.Tab_5_4_Dirty_Input.setPlaceholderText("Example:\n\nK_P = 5\nK_D = 0\nK_i = 0\n\nsys1 = tf([K_D,K_P,K_i],[1,1.33+K_D,1+K_P,K_i])\n\nOther example:\nsys1 = ss([[2,8],[1,0]],[[1],[-0.5000]],[-1/8,-1],[0])")
self.Tab_5_4_Dirty_Input.setText("#Example:\n\nK_P = 5\nK_D = 0\nK_i = 0\n\nsys1 = tf([K_D,K_P,K_i],[1,1.33+K_D,1+K_P,K_i])\n\n#Other example:\n#sys1 = ss([[2,8],[1,0]],[[1],[-0.5000]],[-1/8,-1],[0])")


self.installEventFilter(self)
Expand Down
3 changes: 3 additions & 0 deletions Patchlog.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,6 @@ v0.14.0: Assuming Direct CONTROL
++ Better Input and more output coming soon
+ (User Request) The LaTeX process is now started at the same time as AMaDiA to make the first display lass annoying

v0.14.0.1: 2nd Control Example
+ Added a 2nd Control Code Input Example to show a syntax for state space input

288 changes: 288 additions & 0 deletions environment.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,288 @@
name: AMaEnv
channels:
- conda-forge
- defaults
dependencies:
- _anaconda_depends=2019.03=py37_0
- _libgcc_mutex=0.1=main
- alabaster=0.7.12=py37_0
- anaconda=custom=py37_1
- anaconda-client=1.7.2=py37_0
- anaconda-project=0.8.3=py_0
- asn1crypto=0.24.0=py37_0
- astroid=2.2.5=py37_0
- astropy=3.2.1=py37h7b6447c_0
- atomicwrites=1.3.0=py37_1
- attrs=19.1.0=py37_1
- babel=2.7.0=py_0
- backcall=0.1.0=py37_0
- backports=1.0=py_2
- backports.os=0.1.1=py37_0
- backports.shutil_get_terminal_size=1.0.0=py37_2
- beautifulsoup4=4.7.1=py37_1
- bitarray=0.9.3=py37h7b6447c_0
- bkcharts=0.2=py37_0
- blas=1.0=mkl
- bleach=3.1.0=py37_0
- blosc=1.16.3=hd408876_0
- bokeh=1.2.0=py37_0
- boto=2.49.0=py37_0
- bottleneck=1.2.1=py37h035aef0_1
- bzip2=1.0.8=h7b6447c_0
- ca-certificates=2019.9.11=hecc5488_0
- cairo=1.14.12=h8948797_3
- certifi=2019.9.11=py37_0
- cffi=1.12.3=py37h2e261b9_0
- chardet=3.0.4=py37_1
- click=7.0=py37_0
- cloudpickle=1.2.1=py_0
- clyent=1.2.2=py37_1
- colorama=0.4.1=py37_0
- contextlib2=0.5.5=py37_0
- control=0.8.2=py37_0
- cryptography=2.7=py37h1ba5d50_0
- curl=7.65.2=hbc83047_0
- cycler=0.10.0=py37_0
- cython=0.29.12=py37he6710b0_0
- cytoolz=0.10.0=py37h7b6447c_0
- dask=2.1.0=py_0
- dask-core=2.1.0=py_0
- dbus=1.13.6=h746ee38_0
- decorator=4.4.0=py37_1
- defusedxml=0.6.0=py_0
- distributed=2.1.0=py_0
- docutils=0.14=py37_0
- entrypoints=0.3=py37_0
- et_xmlfile=1.0.1=py37_0
- expat=2.2.6=he6710b0_0
- fastcache=1.1.0=py37h7b6447c_0
- filelock=3.0.12=py_0
- flask=1.1.1=py_0
- fontconfig=2.13.0=h9420a91_0
- freetype=2.9.1=h8a8886c_1
- fribidi=1.0.5=h7b6447c_0
- get_terminal_size=1.0.0=haa9412d_0
- gevent=1.4.0=py37h7b6447c_0
- glib=2.56.2=hd408876_0
- glob2=0.7=py_0
- gmp=6.1.2=h6c8ec71_1
- gmpy2=2.0.8=py37h10f8cd9_2
- graphite2=1.3.13=h23475e2_0
- greenlet=0.4.15=py37h7b6447c_0
- gst-plugins-base=1.14.0=hbbd80ab_1
- gstreamer=1.14.0=hb453b48_1
- h5py=2.9.0=py37h7918eee_0
- harfbuzz=1.8.8=hffaf4a1_0
- hdf5=1.10.4=hb1b8bf9_0
- heapdict=1.0.0=py37_2
- html5lib=1.0.1=py37_0
- icu=58.2=h9c2bf20_1
- idna=2.8=py37_0
- imageio=2.5.0=py37_0
- imagesize=1.1.0=py37_0
- importlib_metadata=0.17=py37_1
- intel-openmp=2019.4=243
- ipykernel=5.1.1=py37h39e3cac_0
- ipython=7.6.1=py37h39e3cac_0
- ipython_genutils=0.2.0=py37_0
- ipywidgets=7.5.0=py_0
- isort=4.3.21=py37_0
- itsdangerous=1.1.0=py37_0
- jbig=2.1=hdba287a_0
- jdcal=1.4.1=py_0
- jedi=0.13.3=py37_0
- jeepney=0.4=py37_0
- jinja2=2.10.1=py37_0
- joblib=0.13.2=py37_0
- jpeg=9b=h024ee3a_2
- json5=0.8.4=py_0
- jsonschema=3.0.1=py37_0
- jupyter=1.0.0=py37_7
- jupyter_client=5.3.1=py_0
- jupyter_console=6.0.0=py37_0
- jupyter_core=4.5.0=py_0
- jupyterlab=1.0.2=py37hf63ae98_0
- jupyterlab_server=1.0.0=py_0
- keyring=18.0.0=py37_0
- kiwisolver=1.1.0=py37he6710b0_0
- krb5=1.16.1=h173b8e3_7
- lazy-object-proxy=1.4.1=py37h7b6447c_0
- libarchive=3.3.3=h5d8350f_5
- libcurl=7.65.2=h20c2e04_0
- libedit=3.1.20181209=hc058e9b_0
- libffi=3.2.1=hd88cf55_4
- libgcc-ng=9.1.0=hdf63c60_0
- libgfortran-ng=7.3.0=hdf63c60_0
- liblief=0.9.0=h7725739_2
- libopenblas=0.3.7=h6e990d7_2
- libpng=1.6.37=hbc83047_0
- libsodium=1.0.16=h1bed415_0
- libssh2=1.8.2=h1ba5d50_0
- libstdcxx-ng=9.1.0=hdf63c60_0
- libtiff=4.0.10=h2733197_2
- libtool=2.4.6=h7b6447c_5
- libuuid=1.0.3=h1bed415_2
- libxcb=1.13=h1bed415_1
- libxml2=2.9.9=hea5a465_1
- libxslt=1.1.33=h7d1a2b0_0
- llvmlite=0.29.0=py37hd408876_0
- locket=0.2.0=py37_1
- lxml=4.3.4=py37hefd8a0e_0
- lz4-c=1.8.1.2=h14c3975_0
- lzo=2.10=h49e0be7_2
- markupsafe=1.1.1=py37h7b6447c_0
- matplotlib=3.1.0=py37h5429711_0
- mccabe=0.6.1=py37_1
- mistune=0.8.4=py37h7b6447c_0
- mkl=2019.4=243
- mkl-service=2.0.2=py37h7b6447c_0
- mkl_fft=1.0.12=py37ha843d7b_0
- mkl_random=1.0.2=py37hd81dba3_0
- mock=3.0.5=py37_0
- more-itertools=7.0.0=py37_0
- mpc=1.1.0=h10f8cd9_1
- mpfr=4.0.1=hdf1c602_3
- mpmath=1.1.0=py37_0
- msgpack-python=0.6.1=py37hfd86e86_1
- multipledispatch=0.6.0=py37_0
- nbconvert=5.5.0=py_0
- nbformat=4.4.0=py37_0
- ncurses=6.1=he6710b0_1
- networkx=2.3=py_0
- nltk=3.4.4=py37_0
- nose=1.3.7=py37_2
- notebook=6.0.0=py37_0
- numba=0.44.1=py37h962f231_0
- numexpr=2.6.9=py37h9e4a6bb_0
- numpy=1.16.4=py37h7e9f1db_0
- numpy-base=1.16.4=py37hde5b4d6_0
- numpydoc=0.9.1=py_0
- olefile=0.46=py37_0
- openblas=0.3.7=h6e990d7_2
- openpyxl=2.6.2=py_0
- openssl=1.1.1c=h516909a_0
- packaging=19.0=py37_0
- pandas=0.24.2=py37he6710b0_0
- pandoc=2.2.3.2=0
- pandocfilters=1.4.2=py37_1
- pango=1.42.4=h049681c_0
- parso=0.5.0=py_0
- partd=1.0.0=py_0
- patchelf=0.9=he6710b0_3
- path.py=12.0.1=py_0
- pathlib2=2.3.4=py37_0
- patsy=0.5.1=py37_0
- pcre=8.43=he6710b0_0
- pep8=1.7.1=py37_0
- pexpect=4.7.0=py37_0
- pickleshare=0.7.5=py37_0
- pillow=6.1.0=py37h34e0f95_0
- pip=19.1.1=py37_0
- pixman=0.38.0=h7b6447c_0
- pkginfo=1.5.0.1=py37_0
- pluggy=0.12.0=py_0
- ply=3.11=py37_0
- prometheus_client=0.7.1=py_0
- prompt_toolkit=2.0.9=py37_0
- psutil=5.6.3=py37h7b6447c_0
- ptyprocess=0.6.0=py37_0
- py=1.8.0=py37_0
- py-lief=0.9.0=py37h7725739_2
- pycodestyle=2.5.0=py37_0
- pycosat=0.6.3=py37h14c3975_0
- pycparser=2.19=py37_0
- pycrypto=2.6.1=py37h14c3975_9
- pycurl=7.43.0.3=py37h1ba5d50_0
- pyflakes=2.1.1=py37_0
- pygments=2.4.2=py_0
- pylint=2.3.1=py37_0
- pyodbc=4.0.26=py37he6710b0_0
- pyopenssl=19.0.0=py37_0
- pyparsing=2.4.0=py_0
- pyqt=5.9.2=py37h05f1152_2
- pyrsistent=0.14.11=py37h7b6447c_0
- pysocks=1.7.0=py37_0
- pytables=3.5.2=py37h71ec239_1
- pytest=5.0.1=py37_0
- pytest-arraydiff=0.3=py37h39e3cac_0
- pytest-astropy=0.5.0=py37_0
- pytest-doctestplus=0.3.0=py37_0
- pytest-openfiles=0.3.2=py37_0
- pytest-remotedata=0.3.1=py37_0
- python=3.7.3=h0371630_0
- python-dateutil=2.8.0=py37_0
- python-libarchive-c=2.8=py37_11
- pytz=2019.1=py_0
- pywavelets=1.0.3=py37hdd07704_1
- pyyaml=5.1.1=py37h7b6447c_0
- pyzmq=18.0.0=py37he6710b0_0
- qt=5.9.7=h5867ecd_1
- qtawesome=0.5.7=py37_1
- qtconsole=4.5.1=py_0
- qtpy=1.8.0=py_0
- readline=7.0=h7b6447c_5
- requests=2.22.0=py37_0
- rope=0.14.0=py_0
- ruamel_yaml=0.15.46=py37h14c3975_0
- scikit-image=0.15.0=py37he6710b0_0
- scikit-learn=0.21.2=py37hd81dba3_0
- scipy=1.3.0=py37h7c811a0_0
- seaborn=0.9.0=py37_0
- secretstorage=3.1.1=py37_0
- send2trash=1.5.0=py37_0
- setuptools=41.0.1=py37_0
- simplegeneric=0.8.1=py37_2
- singledispatch=3.4.0.3=py37_0
- sip=4.19.8=py37hf484d3e_0
- six=1.12.0=py37_0
- slycot=0.3.5.0=py37h7eb8c7e_0
- snappy=1.1.7=hbae5bb6_3
- snowballstemmer=1.9.0=py_0
- sortedcollections=1.1.2=py37_0
- sortedcontainers=2.1.0=py37_0
- soupsieve=1.8=py37_0
- sphinx=2.1.2=py_0
- sphinxcontrib=1.0=py37_1
- sphinxcontrib-applehelp=1.0.1=py_0
- sphinxcontrib-devhelp=1.0.1=py_0
- sphinxcontrib-htmlhelp=1.0.2=py_0
- sphinxcontrib-jsmath=1.0.1=py_0
- sphinxcontrib-qthelp=1.0.2=py_0
- sphinxcontrib-serializinghtml=1.1.3=py_0
- sphinxcontrib-websupport=1.1.2=py_0
- spyder=3.3.6=py37_0
- spyder-kernels=0.5.1=py37_0
- sqlalchemy=1.3.5=py37h7b6447c_0
- sqlite=3.29.0=h7b6447c_0
- statsmodels=0.10.0=py37hdd07704_0
- sympy=1.4=py37_0
- tblib=1.4.0=py_0
- terminado=0.8.2=py37_0
- testpath=0.4.2=py37_0
- tk=8.6.8=hbc83047_0
- toolz=0.10.0=py_0
- tornado=6.0.3=py37h7b6447c_0
- tqdm=4.32.1=py_0
- traitlets=4.3.2=py37_0
- unicodecsv=0.14.1=py37_0
- unixodbc=2.3.7=h14c3975_0
- urllib3=1.24.2=py37_0
- wcwidth=0.1.7=py37_0
- webencodings=0.5.1=py37_1
- werkzeug=0.15.4=py_0
- wheel=0.33.4=py37_0
- widgetsnbextension=3.5.0=py37_0
- wrapt=1.11.2=py37h7b6447c_0
- wurlitzer=1.0.2=py37_0
- xlrd=1.2.0=py37_0
- xlsxwriter=1.1.8=py_0
- xlwt=1.3.0=py37_0
- xz=5.2.4=h14c3975_4
- yaml=0.1.7=had09818_2
- zeromq=4.3.1=he6710b0_3
- zict=1.0.0=py_0
- zipp=0.5.1=py_0
- zlib=1.2.11=h7b6447c_3
- zstd=1.3.7=h0b5b093_0
prefix: /home/robin/anaconda3/envs/AMaEnv

0 comments on commit 02e4001

Please sign in to comment.