Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docs/docs/tutorials/fitting-bayesian.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,10 @@
"from easyscience import ObjBase\n",
"from easyscience import Parameter\n",
"\n",
"area = Parameter(name='area', value=10, fixed=False, min=1, max=100)\n",
"gamma = Parameter(name='gamma', value=8e-3, fixed=False, min=1e-4, max=1e-2)\n",
"omega_0 = Parameter(name='omega_0', value=1e-3, fixed=False, min=0, max=2e-3)\n",
"sigma = Parameter(name='sigma', value=1e-3, fixed=False, min=1e-5, max=1e-1)\n",
"area = Parameter(display_name='area', value=10, fixed=False, min=1, max=100)\n",
"gamma = Parameter(display_name='gamma', value=8e-3, fixed=False, min=1e-4, max=1e-2)\n",
"omega_0 = Parameter(display_name='omega_0', value=1e-3, fixed=False, min=0, max=2e-3)\n",
"sigma = Parameter(display_name='sigma', value=1e-3, fixed=False, min=1e-5, max=1e-1)\n",
"\n",
"parameter_container = ObjBase(name='params', A=area, gamma=gamma, omega_0=omega_0, sigma=sigma)"
]
Expand Down
8 changes: 4 additions & 4 deletions docs/docs/tutorials/fitting-qens.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -246,10 +246,10 @@
"source": [
"from easyscience import Parameter\n",
"\n",
"A = Parameter(name='A', value=10, fixed=False, min=0.01, max=100)\n",
"gamma = Parameter(name='gamma', value=8e-3, fixed=False, min=1e-4, max=10e-3)\n",
"omega_0 = Parameter(name='omega_0', value=0.001, fixed=False, min=0, max=0.002)\n",
"sigma = Parameter(name='sigma', value=0.001, fixed=False, min=1e-5, max=0.1)"
"A = Parameter(display_name='A', value=10, fixed=False, min=0.01, max=100)\n",
"gamma = Parameter(display_name='gamma', value=8e-3, fixed=False, min=1e-4, max=10e-3)\n",
"omega_0 = Parameter(display_name='omega_0', value=0.001, fixed=False, min=0, max=0.002)\n",
"sigma = Parameter(display_name='sigma', value=0.001, fixed=False, min=1e-5, max=0.1)"
]
},
{
Expand Down
8 changes: 4 additions & 4 deletions docs/docs/tutorials/fitting-sans.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,10 @@
"source": [
"from easyscience import Parameter\n",
"\n",
"scale = Parameter(name='scale', value=1.4e-7, fixed=True)\n",
"delta_rho = Parameter(name='delta_rho', value=3, fixed=False, min=0, max=10)\n",
"r = Parameter(name='r', value=80, fixed=False, min=0, max=1000)\n",
"bkg = Parameter(name='bkg', value=0.01, fixed=False, min=0.001, max=0.1)"
"scale = Parameter(display_name='scale', value=1.4e-7, fixed=True)\n",
"delta_rho = Parameter(display_name='delta_rho', value=3, fixed=False, min=0, max=10)\n",
"r = Parameter(display_name='r', value=80, fixed=False, min=0, max=1000)\n",
"bkg = Parameter(display_name='bkg', value=0.01, fixed=False, min=0.001, max=0.1)"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/tutorials/progress-callback.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
" sigma3: Parameter\n",
"\n",
" def __init__(self, **values):\n",
" params = {name: Parameter(name, value) for name, value in values.items()}\n",
" params = {name: Parameter(value, display_name=name) for name, value in values.items()}\n",
" super().__init__('multipeak', **params)\n",
"\n",
" def __call__(self, x):\n",
Expand Down
259 changes: 0 additions & 259 deletions legacy/PARAMETER_DEPENDENCY_SERIALIZATION.md

This file was deleted.

17 changes: 7 additions & 10 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
###########

[workspace]

# Supported platforms for the lock file (pixi.lock)
platforms = [
'win-64',
# Set minimum supported version for glibc to be 2.35 to ensure packages
# like `crysfml` that only have wheels for glibc 2.35+
# (manylinux_2_35_x86_64) are used.
#libc = { family = 'glibc', version = '2.35' }
# libc = { family = 'glibc', version = '2.35' }
{ platform = 'linux-64', glibc = '2.35' },
# Set minimum supported version for macOS to be 14.0 to ensure packages
# like `scipp` that only have wheels for macOS 14.0+ (macosx_14_0_arm64)
Expand Down Expand Up @@ -44,8 +43,8 @@ python = '3.14.*'
# editable installations.

[feature.dev.dependencies]
nodejs = '*' # Required for Prettier (non-Python formatting)
pixi-kernel = '*' # Pixi Jupyter kernel
nodejs = '*' # Required for Prettier (non-Python formatting)
pixi-kernel = '*' # Pixi Jupyter kernel

[feature.dev.pypi-dependencies]
pip = '*'
Expand All @@ -55,7 +54,7 @@ easyscience = { path = '.', editable = true, extras = ['dev'] }
# of editable installations.

[feature.user.dependencies]
pixi-kernel = '*' # Pixi Jupyter kernel
pixi-kernel = '*' # Pixi Jupyter kernel

[feature.user.pypi-dependencies]
pip = '*'
Expand All @@ -66,7 +65,6 @@ easyscience = '*'
##############

[environments]

# The `default` feature is always included in all environments.
# Additional features can be specified per environment.

Expand All @@ -87,7 +85,6 @@ user = { features = ['py-max', 'user'] }
#######

[tasks]

##################
# 🧪 Testing Tasks
##################
Expand Down Expand Up @@ -172,9 +169,9 @@ notebook-tweak = 'python tools/tweak_notebooks.py docs/docs/tutorials/'
notebook-exec = 'python -m pytest --nbmake docs/docs/tutorials/ --nbmake-timeout=1200 --overwrite --color=yes -n auto -v'

notebook-prepare = { depends-on = [
#'notebook-convert',
# 'notebook-convert',
'notebook-strip',
#'notebook-tweak',
# 'notebook-tweak',
] }

########################
Expand Down Expand Up @@ -266,7 +263,7 @@ clean-pycache = "find . -type d -name '__pycache__' -prune -exec rm -rf '{}' +"
post-install = { depends-on = [
'npm-config',
'prettier-install',
#'pre-commit-setup',
# 'pre-commit-setup',
] }

##########################
Expand Down
Loading
Loading