Skip to content
This repository has been archived by the owner on May 31, 2024. It is now read-only.

Commit

Permalink
Merge pull request #189 from PTB-M4D/fix/#147_rewrite_inverse_methods…
Browse files Browse the repository at this point in the history
…_of_model_estimation

Rewrite inverse methods of model estimation
  • Loading branch information
BjoernLudwigPTB authored Nov 4, 2021
2 parents a63fe71 + 8aca955 commit bed552b
Show file tree
Hide file tree
Showing 49 changed files with 3,844 additions and 1,206 deletions.
8 changes: 4 additions & 4 deletions docs/Deconvolution by FIR.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Design of a digital deconvolution filter (FIR type)

.. code:: python
from PyDynamic.model_estimation.fit_filter import invLSFIR_unc
from PyDynamic.model_estimation.fit_filter import LSFIR
from PyDynamic.misc.SecondOrderSystem import *
from PyDynamic.misc.testsignals import shocklikeGaussian
from PyDynamic.misc.filterstuff import kaiser_lowpass, db
Expand Down Expand Up @@ -193,7 +193,7 @@ Filter coefficients and associated uncertainties are thus obtained as
# Calculation of FIR deconvolution filter and its assoc. unc.
N = 12; tau = N//2
bF, UbF = invLSFIR_unc(H,UH,N,tau,f,Fs)
bF, UbF = LSFIR(H,N,tau,f,Fs,UH=UH)
.. parsed-literal::
Expand Down Expand Up @@ -297,8 +297,8 @@ Fit an FIR filter to the reciprocal of the measured frequency response

.. code:: python
from PyDynamic.model_estimation.fit_filter import invLSFIR_unc
bF, UbF = invLSFIR_unc(H,UH,N,tau,f,Fs, verbose=False)
from PyDynamic.model_estimation.fit_filter import LSFIR
bF, UbF = LSFIR(H,N,tau,f,Fs,verbose=False,UH=UH)
with

Expand Down
2 changes: 1 addition & 1 deletion docs/PyDynamic.uncertainty.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@ Monte Carlo methods for digital filtering
Uncertainty evaluation for interpolation
----------------------------------------

.. automodule:: PyDynamic.uncertainty.interpolation
.. automodule:: PyDynamic.uncertainty.interpolate
:members:
3 changes: 0 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,6 @@
# If true, keep warnings as "system message" paragraphs in the built documents.
# keep_warnings = False

# If true, `todo` and `todoList` produce output, else they produce nothing.
todo_include_todos = True


# -- Options for HTML output ----------------------------------------------

Expand Down
66 changes: 33 additions & 33 deletions requirements/dev-requirements-py36.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
alabaster==0.7.12
# via sphinx
astroid==2.7.3
astroid==2.8.2
# via pylint
async-generator==1.10
# via nbclient
Expand All @@ -19,19 +19,19 @@ babel==2.9.1
# via sphinx
backports.entry-points-selectable==1.1.0
# via virtualenv
black==21.8b0
black==21.9b0
# via -r requirements/dev-requirements.in
bleach==4.1.0
# via
# nbconvert
# readme-renderer
certifi==2021.5.30
certifi==2021.10.8
# via requests
cffi==1.14.6
cffi==1.15.0
# via cryptography
charset-normalizer==2.0.4
charset-normalizer==2.0.7
# via requests
click==8.0.1
click==8.0.3
# via
# black
# click-log
Expand All @@ -42,19 +42,19 @@ colorama==0.4.4
# via twine
commonmark==0.9.1
# via recommonmark
coverage==5.5
coverage[toml]==6.0.2
# via pytest-cov
cryptography==3.4.8
cryptography==35.0.0
# via secretstorage
dataclasses==0.8
# via black
decorator==5.1.0
# via traitlets
defusedxml==0.7.1
# via nbconvert
distlib==0.3.2
distlib==0.3.3
# via virtualenv
docutils==0.16
docutils==0.17.1
# via
# nbsphinx
# readme-renderer
Expand All @@ -67,17 +67,17 @@ entrypoints==0.3
# via
# jupyter-client
# nbconvert
filelock==3.0.12
filelock==3.3.1
# via
# tox
# virtualenv
gitdb==4.0.7
# via gitpython
gitpython==3.1.18
# via python-semantic-release
hypothesis==6.21.0
hypothesis==6.23.2
# via -r requirements/dev-requirements.in
idna==3.2
idna==3.3
# via requests
imagesize==1.2.0
# via sphinx
Expand Down Expand Up @@ -108,16 +108,16 @@ jeepney==0.7.1
# via
# keyring
# secretstorage
jinja2==3.0.1
jinja2==3.0.2
# via
# nbconvert
# nbsphinx
# sphinx
jsonschema==3.2.0
# via nbformat
jupyter-client==7.0.2
jupyter-client==7.0.6
# via nbclient
jupyter-core==4.7.1
jupyter-core==4.8.1
# via
# jupyter-client
# nbconvert
Expand Down Expand Up @@ -158,13 +158,13 @@ packaging==21.0
# setuptools-scm
# sphinx
# tox
pandocfilters==1.4.3
pandocfilters==1.5.0
# via nbconvert
pathspec==0.9.0
# via black
pkginfo==1.7.1
# via twine
platformdirs==2.3.0
platformdirs==2.4.0
# via
# black
# pylint
Expand All @@ -185,7 +185,7 @@ pygments==2.10.0
# nbconvert
# readme-renderer
# sphinx
pylint==2.10.2
pylint==2.11.1
# via -r requirements/dev-requirements.in
pyparsing==2.4.7
# via
Expand All @@ -197,7 +197,7 @@ pytest==6.2.5
# via
# -r requirements/dev-requirements.in
# pytest-cov
pytest-cov==2.12.1
pytest-cov==3.0.0
# via -r requirements/dev-requirements.in
python-dateutil==2.8.2
# via
Expand All @@ -207,17 +207,17 @@ python-gitlab==2.10.1
# via python-semantic-release
python-semantic-release==7.19.2
# via -r requirements/dev-requirements.in
pytz==2021.1
pytz==2021.3
# via
# -c requirements/requirements-py36.txt
# babel
pyzmq==22.2.1
pyzmq==22.3.0
# via jupyter-client
readme-renderer==29.0
readme-renderer==30.0
# via twine
recommonmark==0.7.1
# via -r requirements/dev-requirements.in
regex==2021.8.28
regex==2021.10.8
# via black
requests==2.26.0
# via
Expand All @@ -232,7 +232,7 @@ requests-toolbelt==0.9.1
# twine
rfc3986==1.5.0
# via twine
rope==0.19.0
rope==0.20.1
# via -r requirements/dev-requirements.in
secretstorage==3.3.1
# via keyring
Expand All @@ -246,7 +246,6 @@ six==1.16.0
# bleach
# jsonschema
# python-dateutil
# readme-renderer
# tox
# traitlets
# virtualenv
Expand All @@ -262,7 +261,7 @@ sphinx==4.2.0
# nbsphinx
# recommonmark
# sphinx-rtd-theme
sphinx-rtd-theme==0.5.2
sphinx-rtd-theme==1.0.0
# via -r requirements/dev-requirements.in
sphinxcontrib-applehelp==1.0.2
# via sphinx
Expand All @@ -282,19 +281,19 @@ toml==0.10.2
# via
# pylint
# pytest
# pytest-cov
# tox
tomli==1.2.1
# via
# black
# coverage
# setuptools-scm
tomlkit==0.7.0
# via python-semantic-release
tornado==6.1
# via jupyter-client
tox==3.24.3
tox==3.24.4
# via -r requirements/dev-requirements.in
tqdm==4.62.2
tqdm==4.62.3
# via twine
traitlets==4.3.3
# via
Expand All @@ -316,17 +315,18 @@ typing-extensions==3.10.0.2
# black
# gitpython
# importlib-metadata
urllib3==1.26.6
# pylint
urllib3==1.26.7
# via requests
virtualenv==20.7.2
virtualenv==20.8.1
# via tox
webencodings==0.5.1
# via bleach
wheel==0.37.0
# via python-semantic-release
wrapt==1.12.1
# via astroid
zipp==3.5.0
zipp==3.6.0
# via
# importlib-metadata
# importlib-resources
Expand Down
Loading

0 comments on commit bed552b

Please sign in to comment.