Skip to content

Commit

Permalink
build: upgrade to expertsystem v0.7.1 (#248)
Browse files Browse the repository at this point in the history
  • Loading branch information
redeboer committed Mar 24, 2021
1 parent ea97355 commit 9c38c96
Show file tree
Hide file tree
Showing 26 changed files with 57 additions and 57 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
# Intersphinx settings
intersphinx_mapping = {
"expertsystem": (
"https://pwa.readthedocs.io/projects/expertsystem/en/0.7.0a0",
"https://pwa.readthedocs.io/projects/expertsystem/en/0.7.1",
None,
),
"iminuit": ("https://iminuit.readthedocs.io/en/stable", None),
Expand Down
2 changes: 1 addition & 1 deletion docs/usage.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
"source": [
"sympy_model = SympyModel(\n",
" expression=model.expression,\n",
" parameters=model.parameters,\n",
" parameters=model.parameter_defaults,\n",
")\n",
"intensity = LambdifiedFunction(sympy_model, backend=\"numpy\")\n",
"data_converter = HelicityTransformer(model.adapter)\n",
Expand Down
6 changes: 3 additions & 3 deletions docs/usage/step1.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"As a small goodie, you can use [`graphviz`](https://pypi.org/project/graphviz) to {doc}`visualize <expertsystem:usage/visualization>` the generated graphs:"
"As a small goodie, you can use [`graphviz`](https://pypi.org/project/graphviz) to {doc}`visualize <expertsystem:usage/visualize>` the generated graphs:"
]
},
{
Expand Down Expand Up @@ -102,7 +102,7 @@
"source": [
"model_builder = es.amplitude.get_builder(result)\n",
"model = model_builder.generate()\n",
"display(*model.parameters)"
"display(*model.parameter_defaults)"
]
},
{
Expand Down Expand Up @@ -146,7 +146,7 @@
"metadata": {},
"outputs": [],
"source": [
"sorted(model.parameters, key=lambda s: s.name)"
"sorted(model.parameter_defaults, key=lambda s: s.name)"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion docs/usage/step2.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
"\n",
"sympy_model = SympyModel(\n",
" expression=model.expression,\n",
" parameters=model.parameters,\n",
" parameters=model.parameter_defaults,\n",
")\n",
"intensity = LambdifiedFunction(sympy_model, backend=\"numpy\")"
]
Expand Down
4 changes: 2 additions & 2 deletions docs/usage/step3.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
" phsp_set = pickle.load(stream)\n",
"sympy_model = SympyModel(\n",
" expression=model.expression,\n",
" parameters=model.parameters,\n",
" parameters=model.parameter_defaults,\n",
")"
]
},
Expand Down Expand Up @@ -548,7 +548,7 @@
"source": [
"model.components[\n",
" R\"A[J/\\psi(1S)_{+1} \\to f_{0}(1370)_{0} \\gamma_{+1};f_{0}(1370)_{0} \\to \\pi^{0}_{0} \\pi^{0}_{0}]\"\n",
"].subs(model.parameters).doit()"
"].subs(model.parameter_defaults).doit()"
]
},
{
Expand Down
8 changes: 4 additions & 4 deletions reqs/3.6/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dm-tree==0.1.5
docutils==0.16
entrypoints==0.3
execnet==1.8.0
expertsystem==0.7.0
expertsystem==0.7.1
filelock==3.0.12
flake8-blind-except==0.2.0
flake8-bugbear==21.3.2
Expand Down Expand Up @@ -73,15 +73,15 @@ ipython-genutils==0.2.0
ipython==7.16.1
ipywidgets==7.6.3
isort==5.8.0
jax==0.2.10
jax==0.2.11
jaxlib==0.1.64
jedi==0.18.0
jinja2==2.11.3
json5==0.9.5
jsonschema==3.2.0
jupyter-cache==0.4.2
jupyter-client==6.1.12
jupyter-console==6.3.0
jupyter-console==6.4.0
jupyter-core==4.7.1
jupyter-packaging==0.7.12
jupyter-server==1.5.0
Expand Down Expand Up @@ -149,7 +149,7 @@ pycparser==2.20
pydata-sphinx-theme==0.4.3
pydeps==1.9.13
pydocstyle==6.0.0
pyflakes==2.3.0
pyflakes==2.3.1
pygments==2.8.1
pylint==2.7.2
pyparsing==2.4.7
Expand Down
6 changes: 3 additions & 3 deletions reqs/3.6/requirements-doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ defusedxml==0.7.1
dm-tree==0.1.5
docutils==0.16
entrypoints==0.3
expertsystem==0.7.0
expertsystem==0.7.1
flatbuffers==1.12
fuzzywuzzy==0.18.0
gast==0.3.3
Expand All @@ -49,14 +49,14 @@ ipykernel==5.5.0
ipython-genutils==0.2.0
ipython==7.16.1
ipywidgets==7.6.3
jax==0.2.10
jax==0.2.11
jaxlib==0.1.64
jedi==0.18.0
jinja2==2.11.3
jsonschema==3.2.0
jupyter-cache==0.4.2
jupyter-client==6.1.12
jupyter-console==6.3.0
jupyter-console==6.4.0
jupyter-core==4.7.1
jupyter-sphinx==0.3.1
jupyter==1.0.0
Expand Down
4 changes: 2 additions & 2 deletions reqs/3.6/requirements-extras.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ chardet==4.0.0
cloudpickle==1.6.0
decorator==4.4.2
dm-tree==0.1.5
expertsystem==0.7.0
expertsystem==0.7.1
flatbuffers==1.12
gast==0.3.3
google-auth-oauthlib==0.4.3
Expand All @@ -26,7 +26,7 @@ idna==2.10
iminuit==2.4.0
importlib-metadata==3.7.3
importlib-resources==3.0.0
jax==0.2.10
jax==0.2.11
jaxlib==0.1.64
jsonschema==3.2.0
keras-preprocessing==1.1.2
Expand Down
6 changes: 3 additions & 3 deletions reqs/3.6/requirements-sty.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ distlib==0.3.1
dm-tree==0.1.5
docutils==0.16
execnet==1.8.0
expertsystem==0.7.0
expertsystem==0.7.1
filelock==3.0.12
flake8-blind-except==0.2.0
flake8-bugbear==21.3.2
Expand All @@ -49,7 +49,7 @@ importlib-resources==3.0.0
iniconfig==1.1.1
ipython-genutils==0.2.0
isort==5.8.0
jax==0.2.10
jax==0.2.11
jaxlib==0.1.64
jsonschema==3.2.0
jupyter-core==4.7.1
Expand Down Expand Up @@ -81,7 +81,7 @@ pyasn1-modules==0.2.8
pyasn1==0.4.8
pycodestyle==2.7.0
pydocstyle==6.0.0
pyflakes==2.3.0
pyflakes==2.3.1
pylint==2.7.2
pyparsing==2.4.7
pyrsistent==0.17.3
Expand Down
4 changes: 2 additions & 2 deletions reqs/3.6/requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ coverage==5.5
decorator==4.4.2
dm-tree==0.1.5
execnet==1.8.0
expertsystem==0.7.0
expertsystem==0.7.1
flatbuffers==1.12
gast==0.3.3
google-auth-oauthlib==0.4.3
Expand All @@ -31,7 +31,7 @@ iminuit==2.4.0
importlib-metadata==3.7.3
importlib-resources==3.0.0
iniconfig==1.1.1
jax==0.2.10
jax==0.2.11
jaxlib==0.1.64
jsonschema==3.2.0
keras-preprocessing==1.1.2
Expand Down
2 changes: 1 addition & 1 deletion reqs/3.6/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ chardet==4.0.0
cloudpickle==1.6.0
decorator==4.4.2
dm-tree==0.1.5
expertsystem==0.7.0
expertsystem==0.7.1
flatbuffers==1.12
gast==0.3.3
google-auth-oauthlib==0.4.3
Expand Down
8 changes: 4 additions & 4 deletions reqs/3.7/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dm-tree==0.1.5
docutils==0.16
entrypoints==0.3
execnet==1.8.0
expertsystem==0.7.0
expertsystem==0.7.1
filelock==3.0.12
flake8-blind-except==0.2.0
flake8-bugbear==21.3.2
Expand Down Expand Up @@ -69,15 +69,15 @@ ipython-genutils==0.2.0
ipython==7.21.0
ipywidgets==7.6.3
isort==5.8.0
jax==0.2.10
jax==0.2.11
jaxlib==0.1.64
jedi==0.18.0
jinja2==2.11.3
json5==0.9.5
jsonschema==3.2.0
jupyter-cache==0.4.2
jupyter-client==6.1.12
jupyter-console==6.3.0
jupyter-console==6.4.0
jupyter-core==4.7.1
jupyter-packaging==0.7.12
jupyter-server==1.5.0
Expand Down Expand Up @@ -145,7 +145,7 @@ pycparser==2.20
pydata-sphinx-theme==0.4.3
pydeps==1.9.13
pydocstyle==6.0.0
pyflakes==2.3.0
pyflakes==2.3.1
pygments==2.8.1
pylint==2.7.2
pyparsing==2.4.7
Expand Down
6 changes: 3 additions & 3 deletions reqs/3.7/requirements-doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ defusedxml==0.7.1
dm-tree==0.1.5
docutils==0.16
entrypoints==0.3
expertsystem==0.7.0
expertsystem==0.7.1
flatbuffers==1.12
fuzzywuzzy==0.18.0
gast==0.3.3
Expand All @@ -48,14 +48,14 @@ ipykernel==5.5.0
ipython-genutils==0.2.0
ipython==7.21.0
ipywidgets==7.6.3
jax==0.2.10
jax==0.2.11
jaxlib==0.1.64
jedi==0.18.0
jinja2==2.11.3
jsonschema==3.2.0
jupyter-cache==0.4.2
jupyter-client==6.1.12
jupyter-console==6.3.0
jupyter-console==6.4.0
jupyter-core==4.7.1
jupyter-sphinx==0.3.1
jupyter==1.0.0
Expand Down
4 changes: 2 additions & 2 deletions reqs/3.7/requirements-extras.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ chardet==4.0.0
cloudpickle==1.6.0
decorator==4.4.2
dm-tree==0.1.5
expertsystem==0.7.0
expertsystem==0.7.1
flatbuffers==1.12
gast==0.3.3
google-auth-oauthlib==0.4.3
Expand All @@ -25,7 +25,7 @@ hepunits==2.1.0
idna==2.10
iminuit==2.4.0
importlib-metadata==3.7.3
jax==0.2.10
jax==0.2.11
jaxlib==0.1.64
jsonschema==3.2.0
keras-preprocessing==1.1.2
Expand Down
6 changes: 3 additions & 3 deletions reqs/3.7/requirements-sty.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ distlib==0.3.1
dm-tree==0.1.5
docutils==0.16
execnet==1.8.0
expertsystem==0.7.0
expertsystem==0.7.1
filelock==3.0.12
flake8-blind-except==0.2.0
flake8-bugbear==21.3.2
Expand All @@ -47,7 +47,7 @@ importlib-metadata==3.7.3
iniconfig==1.1.1
ipython-genutils==0.2.0
isort==5.8.0
jax==0.2.10
jax==0.2.11
jaxlib==0.1.64
jsonschema==3.2.0
jupyter-core==4.7.1
Expand Down Expand Up @@ -79,7 +79,7 @@ pyasn1-modules==0.2.8
pyasn1==0.4.8
pycodestyle==2.7.0
pydocstyle==6.0.0
pyflakes==2.3.0
pyflakes==2.3.1
pylint==2.7.2
pyparsing==2.4.7
pyrsistent==0.17.3
Expand Down
4 changes: 2 additions & 2 deletions reqs/3.7/requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ coverage==5.5
decorator==4.4.2
dm-tree==0.1.5
execnet==1.8.0
expertsystem==0.7.0
expertsystem==0.7.1
flatbuffers==1.12
gast==0.3.3
google-auth-oauthlib==0.4.3
Expand All @@ -30,7 +30,7 @@ idna==2.10
iminuit==2.4.0
importlib-metadata==3.7.3
iniconfig==1.1.1
jax==0.2.10
jax==0.2.11
jaxlib==0.1.64
jsonschema==3.2.0
keras-preprocessing==1.1.2
Expand Down
2 changes: 1 addition & 1 deletion reqs/3.7/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ chardet==4.0.0
cloudpickle==1.6.0
decorator==4.4.2
dm-tree==0.1.5
expertsystem==0.7.0
expertsystem==0.7.1
flatbuffers==1.12
gast==0.3.3
google-auth-oauthlib==0.4.3
Expand Down
8 changes: 4 additions & 4 deletions reqs/3.8/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dm-tree==0.1.5
docutils==0.16
entrypoints==0.3
execnet==1.8.0
expertsystem==0.7.0
expertsystem==0.7.1
filelock==3.0.12
flake8-blind-except==0.2.0
flake8-bugbear==21.3.2
Expand Down Expand Up @@ -69,15 +69,15 @@ ipython-genutils==0.2.0
ipython==7.21.0
ipywidgets==7.6.3
isort==5.8.0
jax==0.2.10
jax==0.2.11
jaxlib==0.1.64
jedi==0.18.0
jinja2==2.11.3
json5==0.9.5
jsonschema==3.2.0
jupyter-cache==0.4.2
jupyter-client==6.1.12
jupyter-console==6.3.0
jupyter-console==6.4.0
jupyter-core==4.7.1
jupyter-packaging==0.7.12
jupyter-server==1.5.0
Expand Down Expand Up @@ -145,7 +145,7 @@ pycparser==2.20
pydata-sphinx-theme==0.4.3
pydeps==1.9.13
pydocstyle==6.0.0
pyflakes==2.3.0
pyflakes==2.3.1
pygments==2.8.1
pylint==2.7.2
pyparsing==2.4.7
Expand Down

0 comments on commit 9c38c96

Please sign in to comment.