quantities 0.15.0__tar.gz → 0.16.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {quantities-0.15.0 → quantities-0.16.0}/.github/workflows/test.yml +22 -24
- {quantities-0.15.0 → quantities-0.16.0}/CHANGES.txt +8 -0
- {quantities-0.15.0 → quantities-0.16.0}/PKG-INFO +1 -1
- {quantities-0.15.0 → quantities-0.16.0}/doc/conf.py +2 -2
- {quantities-0.15.0 → quantities-0.16.0}/quantities/__init__.py +2 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/_version.py +2 -2
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/_codata.py +1 -1
- {quantities-0.15.0 → quantities-0.16.0}/quantities/dimensionality.py +6 -3
- {quantities-0.15.0 → quantities-0.16.0}/quantities/quantity.py +50 -39
- {quantities-0.15.0 → quantities-0.16.0}/quantities/registry.py +12 -1
- {quantities-0.15.0 → quantities-0.16.0}/quantities/tests/common.py +6 -1
- {quantities-0.15.0 → quantities-0.16.0}/quantities/tests/test_arithmetic.py +2 -25
- {quantities-0.15.0 → quantities-0.16.0}/quantities/tests/test_methods.py +6 -2
- {quantities-0.15.0 → quantities-0.16.0}/quantities/tests/test_umath.py +9 -1
- {quantities-0.15.0 → quantities-0.16.0}/quantities/uncertainquantity.py +24 -22
- {quantities-0.15.0 → quantities-0.16.0}/quantities.egg-info/PKG-INFO +1 -1
- {quantities-0.15.0 → quantities-0.16.0}/.gitattributes +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/.gitignore +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/.readthedocs.yaml +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/MANIFEST.in +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/README.rst +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/conda.recipe/bld.bat +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/conda.recipe/build.sh +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/conda.recipe/format_version.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/conda.recipe/meta.yaml +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/conda.recipe/run_test.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/doc/Makefile +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/doc/_templates/indexsidebar.html +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/doc/devel/devnotes.rst +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/doc/devel/documenting.rst +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/doc/devel/index.rst +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/doc/devel/release.rst +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/doc/index.rst +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/doc/make.bat +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/doc/rtd-requirements.txt +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/doc/sphinxext/ipython_console_highlighting.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/doc/user/credits.rst +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/doc/user/index.rst +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/doc/user/installation.rst +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/doc/user/issues.rst +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/doc/user/license.rst +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/doc/user/tutorial.rst +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/pyproject.toml +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/NIST_codata.txt +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/__init__.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/_utils.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/alpha.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/astronomy.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/atomicunits.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/deuteron.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/electromagnetism.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/electron.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/helion.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/mathematical.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/muon.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/naturalunits.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/neutron.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/proton.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/quantum.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/relationships.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/statisticalmechanics.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/tau.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/triton.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/weak.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/constants/xray.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/decorators.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/dimensionality.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/markup.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/quantity.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/registry.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/tests/__init__.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/tests/test_comparison.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/tests/test_constants.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/tests/test_conversion.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/tests/test_dimensionality.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/tests/test_formatting.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/tests/test_persistence.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/tests/test_uncertainty.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/tests/test_units.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/typing/__init__.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/typing/quantities.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/umath.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/unitquantity.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/unitquantity.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/__init__.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/acceleration.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/acceleration.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/angle.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/angle.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/area.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/area.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/compound.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/compound.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/concentration.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/concentration.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/dimensionless.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/dimensionless.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/electromagnetism.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/electromagnetism.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/energy.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/energy.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/force.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/force.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/frequency.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/frequency.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/heat.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/heat.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/information.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/information.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/length.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/length.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/mass.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/mass.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/power.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/power.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/prefixes.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/prefixes.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/pressure.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/pressure.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/radiation.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/radiation.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/substance.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/substance.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/temperature.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/temperature.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/time.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/time.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/velocity.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/velocity.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/viscosity.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/viscosity.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/volume.py +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities/units/volume.pyi +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities.egg-info/SOURCES.txt +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities.egg-info/dependency_links.txt +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities.egg-info/requires.txt +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/quantities.egg-info/top_level.txt +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/setup.cfg +0 -0
- {quantities-0.15.0 → quantities-0.16.0}/setup.py +0 -0
|
@@ -12,27 +12,23 @@ jobs:
|
|
|
12
12
|
fail-fast: false
|
|
13
13
|
matrix:
|
|
14
14
|
os: [ ubuntu-latest ]
|
|
15
|
-
python-version: [ "3.
|
|
16
|
-
numpy-version: [ "1.
|
|
15
|
+
python-version: [ "3.9", "3.10", "3.11", "3.12" ]
|
|
16
|
+
numpy-version: [ "1.22", "1.23", "1.24", "1.25", "1.26", "2.0" ]
|
|
17
17
|
exclude:
|
|
18
|
-
- python-version: "3.
|
|
19
|
-
numpy-version: "1.
|
|
20
|
-
os: ubuntu-latest
|
|
21
|
-
- python-version: "3.8"
|
|
22
|
-
numpy-version: "1.26"
|
|
18
|
+
- python-version: "3.12"
|
|
19
|
+
numpy-version: "1.22"
|
|
23
20
|
os: ubuntu-latest
|
|
24
|
-
- python-version: "3.
|
|
25
|
-
numpy-version: "1.
|
|
21
|
+
- python-version: "3.12"
|
|
22
|
+
numpy-version: "1.23"
|
|
26
23
|
os: ubuntu-latest
|
|
27
|
-
- python-version: "3.
|
|
28
|
-
numpy-version: "1.
|
|
24
|
+
- python-version: "3.12"
|
|
25
|
+
numpy-version: "1.24"
|
|
29
26
|
os: ubuntu-latest
|
|
30
|
-
- python-version: "3.
|
|
31
|
-
numpy-version: "1.
|
|
27
|
+
- python-version: "3.12"
|
|
28
|
+
numpy-version: "1.25"
|
|
32
29
|
os: ubuntu-latest
|
|
33
|
-
include:
|
|
34
30
|
- python-version: "3.12"
|
|
35
|
-
numpy-version: "
|
|
31
|
+
numpy-version: "2.0"
|
|
36
32
|
os: ubuntu-latest
|
|
37
33
|
steps:
|
|
38
34
|
- uses: actions/checkout@v2
|
|
@@ -79,18 +75,20 @@ jobs:
|
|
|
79
75
|
fail-fast: false
|
|
80
76
|
matrix:
|
|
81
77
|
os: [ ubuntu-latest ]
|
|
82
|
-
python-version: [ "3.
|
|
83
|
-
numpy-version: [ "1.22", "1.23", "1.24", "1.25", "1.26" ]
|
|
78
|
+
python-version: [ "3.9", "3.10", "3.11", "3.12" ]
|
|
79
|
+
numpy-version: [ "1.22", "1.23", "1.24", "1.25", "1.26", "2.0" ]
|
|
84
80
|
exclude:
|
|
85
|
-
- python-version: "3.
|
|
86
|
-
numpy-version: "1.
|
|
81
|
+
- python-version: "3.12"
|
|
82
|
+
numpy-version: "1.22"
|
|
83
|
+
os: ubuntu-latest
|
|
84
|
+
- python-version: "3.12"
|
|
85
|
+
numpy-version: "1.23"
|
|
87
86
|
os: ubuntu-latest
|
|
88
|
-
- python-version: "3.
|
|
89
|
-
numpy-version: "1.
|
|
87
|
+
- python-version: "3.12"
|
|
88
|
+
numpy-version: "1.24"
|
|
90
89
|
os: ubuntu-latest
|
|
91
|
-
include:
|
|
92
90
|
- python-version: "3.12"
|
|
93
|
-
numpy-version: "1.
|
|
91
|
+
numpy-version: "1.25"
|
|
94
92
|
os: ubuntu-latest
|
|
95
93
|
steps:
|
|
96
94
|
- uses: actions/checkout@v2
|
|
@@ -128,4 +126,4 @@ jobs:
|
|
|
128
126
|
|
|
129
127
|
- name: Check type information
|
|
130
128
|
run: |
|
|
131
|
-
mypy quantities
|
|
129
|
+
mypy quantities
|
|
@@ -2,6 +2,14 @@
|
|
|
2
2
|
CHANGES
|
|
3
3
|
=======
|
|
4
4
|
|
|
5
|
+
------
|
|
6
|
+
0.16.0
|
|
7
|
+
------
|
|
8
|
+
|
|
9
|
+
- Added support for NumPy 2.0, while maintaining support for older versions back to 1.22 [`PR#235 <https://github.com/python-quantities/python-quantities/pull/235>`_]. Many thanks to Björn Dahlgren and Zach McKenzie for this.
|
|
10
|
+
- Fixed a potential security hole [`PR#236 <https://github.com/python-quantities/python-quantities/pull/236>`_]
|
|
11
|
+
- Dropped support for Python 3.8
|
|
12
|
+
|
|
5
13
|
------
|
|
6
14
|
0.15.0
|
|
7
15
|
------
|
|
@@ -140,7 +140,7 @@ html_use_smartypants = True
|
|
|
140
140
|
|
|
141
141
|
# Additional templates that should be rendered to pages, maps page names to
|
|
142
142
|
# template names.
|
|
143
|
-
html_sidebars = {'index': 'indexsidebar.html'}
|
|
143
|
+
html_sidebars = {'index': ['localtoc.html', 'relations.html', 'sourcelink.html', 'indexsidebar.html', 'searchbox.html']}
|
|
144
144
|
|
|
145
145
|
# If false, no module index is generated.
|
|
146
146
|
#html_use_modindex = True
|
|
@@ -200,4 +200,4 @@ latex_documents = [
|
|
|
200
200
|
|
|
201
201
|
|
|
202
202
|
# Example configuration for intersphinx: refer to the Python standard library.
|
|
203
|
-
intersphinx_mapping = {'
|
|
203
|
+
intersphinx_mapping = {'python': ('https://docs.python.org/3', None)}
|
|
@@ -9,6 +9,8 @@ from . import markup
|
|
|
9
9
|
from .registry import unit_registry
|
|
10
10
|
from .decorators import memoize
|
|
11
11
|
|
|
12
|
+
_np_version = tuple(map(int, np.__version__.split('.')))
|
|
13
|
+
|
|
12
14
|
def assert_isinstance(obj, types):
|
|
13
15
|
try:
|
|
14
16
|
assert isinstance(obj, types)
|
|
@@ -329,10 +331,11 @@ p_dict[np.ceil] = _d_copy
|
|
|
329
331
|
|
|
330
332
|
def _d_clip(a1, a2, a3, q):
|
|
331
333
|
return q.dimensionality
|
|
332
|
-
|
|
334
|
+
|
|
335
|
+
if _np_version < (2, 0, 0):
|
|
333
336
|
p_dict[np.core.umath.clip] = _d_clip
|
|
334
|
-
|
|
335
|
-
|
|
337
|
+
else:
|
|
338
|
+
p_dict[np.clip] = _d_clip
|
|
336
339
|
|
|
337
340
|
def _d_sqrt(q1, out=None):
|
|
338
341
|
return q1._dimensionality**0.5
|
|
@@ -3,10 +3,11 @@
|
|
|
3
3
|
|
|
4
4
|
import copy
|
|
5
5
|
from functools import wraps
|
|
6
|
+
import warnings
|
|
6
7
|
|
|
7
8
|
import numpy as np
|
|
8
9
|
|
|
9
|
-
from . import markup
|
|
10
|
+
from . import markup, QuantitiesDeprecationWarning
|
|
10
11
|
from .dimensionality import Dimensionality, p_dict
|
|
11
12
|
from .registry import unit_registry
|
|
12
13
|
from .decorators import with_doc
|
|
@@ -114,15 +115,19 @@ class Quantity(np.ndarray):
|
|
|
114
115
|
# TODO: what is an appropriate value?
|
|
115
116
|
__array_priority__ = 21
|
|
116
117
|
|
|
117
|
-
def __new__(cls, data, units='', dtype=None, copy=
|
|
118
|
+
def __new__(cls, data, units='', dtype=None, copy=None):
|
|
119
|
+
if copy is not None:
|
|
120
|
+
warnings.warn(("The 'copy' argument in Quantity is deprecated and will be removed in the future. "
|
|
121
|
+
"The argument has no effect since quantities-0.16.0 (to aid numpy-2.0 support)."),
|
|
122
|
+
QuantitiesDeprecationWarning, stacklevel=2)
|
|
118
123
|
if isinstance(data, Quantity):
|
|
119
124
|
if units:
|
|
120
125
|
data = data.rescale(units)
|
|
121
126
|
if isinstance(data, unit_registry['UnitQuantity']):
|
|
122
127
|
return 1*data
|
|
123
|
-
return np.
|
|
128
|
+
return np.asanyarray(data, dtype=dtype).view(cls)
|
|
124
129
|
|
|
125
|
-
ret = np.
|
|
130
|
+
ret = np.asarray(data, dtype=dtype).view(cls)
|
|
126
131
|
ret._dimensionality.update(validate_dimensionality(units))
|
|
127
132
|
return ret
|
|
128
133
|
|
|
@@ -210,8 +215,8 @@ class Quantity(np.ndarray):
|
|
|
210
215
|
dtype = self.dtype
|
|
211
216
|
if self.dimensionality == to_dims:
|
|
212
217
|
return self.astype(dtype)
|
|
213
|
-
to_u = Quantity(1.0, to_dims)
|
|
214
|
-
from_u = Quantity(1.0, self.dimensionality)
|
|
218
|
+
to_u = Quantity(1.0, to_dims, dtype=dtype)
|
|
219
|
+
from_u = Quantity(1.0, self.dimensionality, dtype=dtype)
|
|
215
220
|
try:
|
|
216
221
|
cf = get_conversion_factor(from_u, to_u)
|
|
217
222
|
except AssertionError:
|
|
@@ -219,6 +224,8 @@ class Quantity(np.ndarray):
|
|
|
219
224
|
'Unable to convert between units of "%s" and "%s"'
|
|
220
225
|
%(from_u._dimensionality, to_u._dimensionality)
|
|
221
226
|
)
|
|
227
|
+
if np.dtype(dtype).kind in 'fc':
|
|
228
|
+
cf = np.array(cf, dtype=dtype)
|
|
222
229
|
new_magnitude = cf*self.magnitude
|
|
223
230
|
dtype = np.result_type(dtype, new_magnitude)
|
|
224
231
|
return Quantity(new_magnitude, to_u, dtype=dtype)
|
|
@@ -272,7 +279,7 @@ class Quantity(np.ndarray):
|
|
|
272
279
|
uf, objs, huh = context
|
|
273
280
|
if uf.__name__.startswith('is'):
|
|
274
281
|
return obj
|
|
275
|
-
|
|
282
|
+
|
|
276
283
|
try:
|
|
277
284
|
res._dimensionality = p_dict[uf](*objs)
|
|
278
285
|
except KeyError:
|
|
@@ -283,11 +290,21 @@ class Quantity(np.ndarray):
|
|
|
283
290
|
)
|
|
284
291
|
return res
|
|
285
292
|
|
|
286
|
-
def __array_wrap__(self, obj, context=None):
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
293
|
+
def __array_wrap__(self, obj, context=None, return_scalar=False):
|
|
294
|
+
_np_version = tuple(map(int, np.__version__.split('.')))
|
|
295
|
+
# For NumPy < 2.0 we do old behavior
|
|
296
|
+
if _np_version < (2, 0, 0):
|
|
297
|
+
if not isinstance(obj, Quantity):
|
|
298
|
+
return self.__array_prepare__(obj, context)
|
|
299
|
+
else:
|
|
300
|
+
return obj
|
|
301
|
+
# For NumPy > 2.0 we either do the prepare or the wrap
|
|
302
|
+
else:
|
|
303
|
+
if not isinstance(obj, Quantity):
|
|
304
|
+
return self.__array_prepare__(obj, context)
|
|
305
|
+
else:
|
|
306
|
+
return super().__array_wrap__(obj, context, return_scalar)
|
|
307
|
+
|
|
291
308
|
|
|
292
309
|
@with_doc(np.ndarray.__add__)
|
|
293
310
|
@scale_other_units
|
|
@@ -476,7 +493,7 @@ class Quantity(np.ndarray):
|
|
|
476
493
|
ret = self.magnitude.sum(axis, dtype, None if out is None else out.magnitude)
|
|
477
494
|
dim = self.dimensionality
|
|
478
495
|
if out is None:
|
|
479
|
-
return Quantity(ret, dim
|
|
496
|
+
return Quantity(ret, dim)
|
|
480
497
|
if not isinstance(out, Quantity):
|
|
481
498
|
raise TypeError("out parameter must be a Quantity")
|
|
482
499
|
out._dimensionality = dim
|
|
@@ -487,8 +504,7 @@ class Quantity(np.ndarray):
|
|
|
487
504
|
import numpy as np
|
|
488
505
|
return Quantity(
|
|
489
506
|
np.nansum(self.magnitude, axis, dtype, out),
|
|
490
|
-
self.dimensionality
|
|
491
|
-
copy=False
|
|
507
|
+
self.dimensionality
|
|
492
508
|
)
|
|
493
509
|
|
|
494
510
|
@with_doc(np.ndarray.fill)
|
|
@@ -523,7 +539,7 @@ class Quantity(np.ndarray):
|
|
|
523
539
|
@with_doc(np.ndarray.searchsorted)
|
|
524
540
|
def searchsorted(self,values, side='left'):
|
|
525
541
|
if not isinstance (values, Quantity):
|
|
526
|
-
values = Quantity(values
|
|
542
|
+
values = Quantity(values)
|
|
527
543
|
|
|
528
544
|
if values._dimensionality != self._dimensionality:
|
|
529
545
|
raise ValueError("values does not have the same units as self")
|
|
@@ -539,7 +555,7 @@ class Quantity(np.ndarray):
|
|
|
539
555
|
ret = self.magnitude.max(axis, None if out is None else out.magnitude)
|
|
540
556
|
dim = self.dimensionality
|
|
541
557
|
if out is None:
|
|
542
|
-
return Quantity(ret, dim
|
|
558
|
+
return Quantity(ret, dim)
|
|
543
559
|
if not isinstance(out, Quantity):
|
|
544
560
|
raise TypeError("out parameter must be a Quantity")
|
|
545
561
|
out._dimensionality = dim
|
|
@@ -553,8 +569,7 @@ class Quantity(np.ndarray):
|
|
|
553
569
|
def nanmax(self, axis=None, out=None):
|
|
554
570
|
return Quantity(
|
|
555
571
|
np.nanmax(self.magnitude),
|
|
556
|
-
self.dimensionality
|
|
557
|
-
copy=False
|
|
572
|
+
self.dimensionality
|
|
558
573
|
)
|
|
559
574
|
|
|
560
575
|
@with_doc(np.ndarray.min)
|
|
@@ -562,7 +577,7 @@ class Quantity(np.ndarray):
|
|
|
562
577
|
ret = self.magnitude.min(axis, None if out is None else out.magnitude)
|
|
563
578
|
dim = self.dimensionality
|
|
564
579
|
if out is None:
|
|
565
|
-
return Quantity(ret, dim
|
|
580
|
+
return Quantity(ret, dim)
|
|
566
581
|
if not isinstance(out, Quantity):
|
|
567
582
|
raise TypeError("out parameter must be a Quantity")
|
|
568
583
|
out._dimensionality = dim
|
|
@@ -572,8 +587,7 @@ class Quantity(np.ndarray):
|
|
|
572
587
|
def nanmin(self, axis=None, out=None):
|
|
573
588
|
return Quantity(
|
|
574
589
|
np.nanmin(self.magnitude),
|
|
575
|
-
self.dimensionality
|
|
576
|
-
copy=False
|
|
590
|
+
self.dimensionality
|
|
577
591
|
)
|
|
578
592
|
|
|
579
593
|
@with_doc(np.ndarray.argmin)
|
|
@@ -590,10 +604,10 @@ class Quantity(np.ndarray):
|
|
|
590
604
|
|
|
591
605
|
@with_doc(np.ndarray.ptp)
|
|
592
606
|
def ptp(self, axis=None, out=None):
|
|
593
|
-
ret = self.magnitude
|
|
607
|
+
ret = np.ptp(self.magnitude, axis, None if out is None else out.magnitude)
|
|
594
608
|
dim = self.dimensionality
|
|
595
609
|
if out is None:
|
|
596
|
-
return Quantity(ret, dim
|
|
610
|
+
return Quantity(ret, dim)
|
|
597
611
|
if not isinstance(out, Quantity):
|
|
598
612
|
raise TypeError("out parameter must be a Quantity")
|
|
599
613
|
out._dimensionality = dim
|
|
@@ -620,7 +634,7 @@ class Quantity(np.ndarray):
|
|
|
620
634
|
)
|
|
621
635
|
dim = self.dimensionality
|
|
622
636
|
if out is None:
|
|
623
|
-
return Quantity(clipped, dim
|
|
637
|
+
return Quantity(clipped, dim)
|
|
624
638
|
if not isinstance(out, Quantity):
|
|
625
639
|
raise TypeError("out parameter must be a Quantity")
|
|
626
640
|
out._dimensionality = dim
|
|
@@ -631,7 +645,7 @@ class Quantity(np.ndarray):
|
|
|
631
645
|
ret = self.magnitude.round(decimals, None if out is None else out.magnitude)
|
|
632
646
|
dim = self.dimensionality
|
|
633
647
|
if out is None:
|
|
634
|
-
return Quantity(ret, dim
|
|
648
|
+
return Quantity(ret, dim)
|
|
635
649
|
if not isinstance(out, Quantity):
|
|
636
650
|
raise TypeError("out parameter must be a Quantity")
|
|
637
651
|
out._dimensionality = dim
|
|
@@ -642,7 +656,7 @@ class Quantity(np.ndarray):
|
|
|
642
656
|
ret = self.magnitude.trace(offset, axis1, axis2, dtype, None if out is None else out.magnitude)
|
|
643
657
|
dim = self.dimensionality
|
|
644
658
|
if out is None:
|
|
645
|
-
return Quantity(ret, dim
|
|
659
|
+
return Quantity(ret, dim)
|
|
646
660
|
if not isinstance(out, Quantity):
|
|
647
661
|
raise TypeError("out parameter must be a Quantity")
|
|
648
662
|
out._dimensionality = dim
|
|
@@ -652,8 +666,7 @@ class Quantity(np.ndarray):
|
|
|
652
666
|
def squeeze(self, axis=None):
|
|
653
667
|
return Quantity(
|
|
654
668
|
self.magnitude.squeeze(axis),
|
|
655
|
-
self.dimensionality
|
|
656
|
-
copy=False
|
|
669
|
+
self.dimensionality
|
|
657
670
|
)
|
|
658
671
|
|
|
659
672
|
@with_doc(np.ndarray.mean)
|
|
@@ -661,7 +674,7 @@ class Quantity(np.ndarray):
|
|
|
661
674
|
ret = self.magnitude.mean(axis, dtype, None if out is None else out.magnitude)
|
|
662
675
|
dim = self.dimensionality
|
|
663
676
|
if out is None:
|
|
664
|
-
return Quantity(ret, dim
|
|
677
|
+
return Quantity(ret, dim)
|
|
665
678
|
if not isinstance(out, Quantity):
|
|
666
679
|
raise TypeError("out parameter must be a Quantity")
|
|
667
680
|
out._dimensionality = dim
|
|
@@ -672,15 +685,14 @@ class Quantity(np.ndarray):
|
|
|
672
685
|
import numpy as np
|
|
673
686
|
return Quantity(
|
|
674
687
|
np.nanmean(self.magnitude, axis, dtype, out),
|
|
675
|
-
self.dimensionality
|
|
676
|
-
copy=False)
|
|
688
|
+
self.dimensionality)
|
|
677
689
|
|
|
678
690
|
@with_doc(np.ndarray.var)
|
|
679
691
|
def var(self, axis=None, dtype=None, out=None, ddof=0):
|
|
680
692
|
ret = self.magnitude.var(axis, dtype, out, ddof)
|
|
681
693
|
dim = self._dimensionality**2
|
|
682
694
|
if out is None:
|
|
683
|
-
return Quantity(ret, dim
|
|
695
|
+
return Quantity(ret, dim)
|
|
684
696
|
if not isinstance(out, Quantity):
|
|
685
697
|
raise TypeError("out parameter must be a Quantity")
|
|
686
698
|
out._dimensionality = dim
|
|
@@ -691,7 +703,7 @@ class Quantity(np.ndarray):
|
|
|
691
703
|
ret = self.magnitude.std(axis, dtype, out, ddof)
|
|
692
704
|
dim = self.dimensionality
|
|
693
705
|
if out is None:
|
|
694
|
-
return Quantity(ret, dim
|
|
706
|
+
return Quantity(ret, dim)
|
|
695
707
|
if not isinstance(out, Quantity):
|
|
696
708
|
raise TypeError("out parameter must be a Quantity")
|
|
697
709
|
out._dimensionality = dim
|
|
@@ -701,8 +713,7 @@ class Quantity(np.ndarray):
|
|
|
701
713
|
def nanstd(self, axis=None, dtype=None, out=None, ddof=0):
|
|
702
714
|
return Quantity(
|
|
703
715
|
np.nanstd(self.magnitude, axis, dtype, out, ddof),
|
|
704
|
-
self._dimensionality
|
|
705
|
-
copy=False
|
|
716
|
+
self._dimensionality
|
|
706
717
|
)
|
|
707
718
|
|
|
708
719
|
@with_doc(np.ndarray.prod)
|
|
@@ -715,7 +726,7 @@ class Quantity(np.ndarray):
|
|
|
715
726
|
ret = self.magnitude.prod(axis, dtype, None if out is None else out.magnitude)
|
|
716
727
|
dim = self._dimensionality**power
|
|
717
728
|
if out is None:
|
|
718
|
-
return Quantity(ret, dim
|
|
729
|
+
return Quantity(ret, dim)
|
|
719
730
|
if not isinstance(out, Quantity):
|
|
720
731
|
raise TypeError("out parameter must be a Quantity")
|
|
721
732
|
out._dimensionality = dim
|
|
@@ -726,7 +737,7 @@ class Quantity(np.ndarray):
|
|
|
726
737
|
ret = self.magnitude.cumsum(axis, dtype, None if out is None else out.magnitude)
|
|
727
738
|
dim = self.dimensionality
|
|
728
739
|
if out is None:
|
|
729
|
-
return Quantity(ret, dim
|
|
740
|
+
return Quantity(ret, dim)
|
|
730
741
|
if not isinstance(out, Quantity):
|
|
731
742
|
raise TypeError("out parameter must be a Quantity")
|
|
732
743
|
out._dimensionality = dim
|
|
@@ -743,7 +754,7 @@ class Quantity(np.ndarray):
|
|
|
743
754
|
ret = self.magnitude.cumprod(axis, dtype, out)
|
|
744
755
|
dim = self.dimensionality
|
|
745
756
|
if out is None:
|
|
746
|
-
return Quantity(ret, dim
|
|
757
|
+
return Quantity(ret, dim)
|
|
747
758
|
if isinstance(out, Quantity):
|
|
748
759
|
out._dimensionality = dim
|
|
749
760
|
return out
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"""
|
|
2
2
|
"""
|
|
3
3
|
|
|
4
|
-
import copy
|
|
5
4
|
import re
|
|
5
|
+
import builtins
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
class UnitRegistry:
|
|
@@ -16,6 +16,17 @@ class UnitRegistry:
|
|
|
16
16
|
self.__context = {}
|
|
17
17
|
|
|
18
18
|
def __getitem__(self, string):
|
|
19
|
+
|
|
20
|
+
# easy hack to prevent arbitrary evaluation of code
|
|
21
|
+
all_builtins = dir(builtins)
|
|
22
|
+
# because we have kilobytes, other bytes we have to remove bytes
|
|
23
|
+
all_builtins.remove("bytes")
|
|
24
|
+
# have to deal with octet as well
|
|
25
|
+
all_builtins.remove("oct")
|
|
26
|
+
for builtin in all_builtins:
|
|
27
|
+
if builtin in string:
|
|
28
|
+
raise RuntimeError(f"String parsing error for {string}. Enter a string accepted by quantities")
|
|
29
|
+
|
|
19
30
|
try:
|
|
20
31
|
return eval(string, self.__context)
|
|
21
32
|
except NameError:
|
|
@@ -19,7 +19,11 @@ class TestCase(unittest.TestCase):
|
|
|
19
19
|
Make sure q1 and q2 are the same quantities to within the given
|
|
20
20
|
precision.
|
|
21
21
|
"""
|
|
22
|
-
|
|
22
|
+
if delta is None:
|
|
23
|
+
# NumPy 2 introduced float16, so we base tolerance on machine epsilon
|
|
24
|
+
delta1 = np.finfo(q1.dtype).eps if isinstance(q1, np.ndarray) and q1.dtype.kind in 'fc' else 1e-15
|
|
25
|
+
delta2 = np.finfo(q2.dtype).eps if isinstance(q2, np.ndarray) and q2.dtype.kind in 'fc' else 1e-15
|
|
26
|
+
delta = max(delta1, delta2)**0.3
|
|
23
27
|
msg = '' if msg is None else ' (%s)' % msg
|
|
24
28
|
|
|
25
29
|
q1 = Quantity(q1)
|
|
@@ -28,6 +32,7 @@ class TestCase(unittest.TestCase):
|
|
|
28
32
|
raise self.failureException(
|
|
29
33
|
f"Shape mismatch ({q1.shape} vs {q2.shape}){msg}"
|
|
30
34
|
)
|
|
35
|
+
|
|
31
36
|
if not np.all(np.abs(q1.magnitude - q2.magnitude) < delta):
|
|
32
37
|
raise self.failureException(
|
|
33
38
|
"Magnitudes differ by more than %g (%s vs %s)%s"
|
|
@@ -48,32 +48,9 @@ def check(f, *args, **kwargs):
|
|
|
48
48
|
return (new, )
|
|
49
49
|
|
|
50
50
|
|
|
51
|
-
class iter_dtypes:
|
|
52
|
-
|
|
53
|
-
def __init__(self):
|
|
54
|
-
self._i = 1
|
|
55
|
-
self._typeDict = np.sctypeDict.copy()
|
|
56
|
-
self._typeDict[17] = int
|
|
57
|
-
self._typeDict[18] = long
|
|
58
|
-
self._typeDict[19] = float
|
|
59
|
-
self._typeDict[20] = complex
|
|
60
|
-
|
|
61
|
-
def __iter__(self):
|
|
62
|
-
return self
|
|
63
|
-
|
|
64
|
-
def __next__(self):
|
|
65
|
-
if self._i > 20:
|
|
66
|
-
raise StopIteration
|
|
67
|
-
|
|
68
|
-
i = self._i
|
|
69
|
-
self._i += 1
|
|
70
|
-
return self._typeDict[i]
|
|
71
|
-
|
|
72
|
-
def next(self):
|
|
73
|
-
return self.__next__()
|
|
74
|
-
|
|
75
51
|
def get_dtypes():
|
|
76
|
-
|
|
52
|
+
numeric_dtypes = 'iufc' # https://numpy.org/doc/stable/reference/generated/numpy.dtype.kind.html
|
|
53
|
+
return [v for v in np.sctypeDict.values() if np.dtype(v).kind in numeric_dtypes] + [int, long, float, complex]
|
|
77
54
|
|
|
78
55
|
|
|
79
56
|
class iter_types:
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
import warnings
|
|
2
|
+
from .. import QuantitiesDeprecationWarning, units as pq
|
|
2
3
|
from .common import TestCase
|
|
3
4
|
import numpy as np
|
|
4
5
|
|
|
@@ -119,7 +120,10 @@ class TestQuantityMethods(TestCase):
|
|
|
119
120
|
)
|
|
120
121
|
if isinstance(result, Quantity):
|
|
121
122
|
# deliberately using an incompatible unit
|
|
122
|
-
|
|
123
|
+
with warnings.catch_warnings():
|
|
124
|
+
warnings.simplefilter("ignore", category=QuantitiesDeprecationWarning)
|
|
125
|
+
out = Quantity(np.empty_like(result.magnitude), pq.s, copy=False)
|
|
126
|
+
# we can drop 'copy=False' above once the deprecation of the arg has expired.
|
|
123
127
|
else:
|
|
124
128
|
out = np.empty_like(result)
|
|
125
129
|
ret = getattr(q.copy(), name)(*args, out=out, **kw)
|
|
@@ -3,6 +3,8 @@ import numpy as np
|
|
|
3
3
|
from .. import units as pq
|
|
4
4
|
from .common import TestCase, unittest
|
|
5
5
|
|
|
6
|
+
_np_version = tuple(map(int, np.__version__.split('.')))
|
|
7
|
+
|
|
6
8
|
|
|
7
9
|
class TestUmath(TestCase):
|
|
8
10
|
|
|
@@ -54,7 +56,13 @@ class TestUmath(TestCase):
|
|
|
54
56
|
self.assertQuantityEqual(np.cross(a,b), [-15,-2,39]*pq.kPa*pq.m**2)
|
|
55
57
|
|
|
56
58
|
def test_trapz(self):
|
|
57
|
-
|
|
59
|
+
# np.trapz is deprecated, np.trapezoid is recommend
|
|
60
|
+
if _np_version < (2, 0, 0):
|
|
61
|
+
self.assertQuantityEqual(np.trapz(self.q, dx = 1*pq.m), 7.5 * pq.J*pq.m)
|
|
62
|
+
|
|
63
|
+
def test_trapezoid(self):
|
|
64
|
+
if _np_version >= (2, 0, 0):
|
|
65
|
+
self.assertQuantityEqual(np.trapezoid(self.q, dx = 1*pq.m), 7.5 * pq.J*pq.m)
|
|
58
66
|
|
|
59
67
|
def test_sinh(self):
|
|
60
68
|
q = [1, 2, 3, 4, 6] * pq.radian
|
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
"""
|
|
3
3
|
|
|
4
4
|
import numpy as np
|
|
5
|
+
import warnings
|
|
5
6
|
|
|
6
|
-
from . import markup
|
|
7
|
+
from . import markup, QuantitiesDeprecationWarning
|
|
7
8
|
from .quantity import Quantity, scale_other_units
|
|
8
9
|
from .registry import unit_registry
|
|
9
10
|
from .decorators import with_doc
|
|
@@ -13,15 +14,20 @@ class UncertainQuantity(Quantity):
|
|
|
13
14
|
# TODO: what is an appropriate value?
|
|
14
15
|
__array_priority__ = 22
|
|
15
16
|
|
|
16
|
-
def __new__(cls, data, units='', uncertainty=None, dtype='d', copy=
|
|
17
|
-
|
|
17
|
+
def __new__(cls, data, units='', uncertainty=None, dtype='d', copy=None):
|
|
18
|
+
if copy is not None:
|
|
19
|
+
warnings.warn(("The 'copy' argument in UncertainQuantity is deprecated and will be removed in the future. "
|
|
20
|
+
"The argument has no effect since quantities-0.16.0 (to aid numpy-2.0 support)."),
|
|
21
|
+
QuantitiesDeprecationWarning, stacklevel=2)
|
|
22
|
+
ret = Quantity.__new__(cls, data, units, dtype)
|
|
18
23
|
# _uncertainty initialized to be dimensionless by __array_finalize__:
|
|
19
24
|
ret._uncertainty._dimensionality = ret._dimensionality
|
|
20
25
|
|
|
21
26
|
if uncertainty is not None:
|
|
22
27
|
ret.uncertainty = Quantity(uncertainty, ret._dimensionality)
|
|
23
28
|
elif isinstance(data, UncertainQuantity):
|
|
24
|
-
|
|
29
|
+
is_copy = id(data) == id(ret)
|
|
30
|
+
if is_copy or ret._dimensionality != uncertainty._dimensionality:
|
|
25
31
|
uncertainty = data.uncertainty.rescale(ret.units)
|
|
26
32
|
ret.uncertainty = uncertainty
|
|
27
33
|
|
|
@@ -50,7 +56,7 @@ class UncertainQuantity(Quantity):
|
|
|
50
56
|
@uncertainty.setter
|
|
51
57
|
def uncertainty(self, uncertainty):
|
|
52
58
|
if not isinstance(uncertainty, Quantity):
|
|
53
|
-
uncertainty = Quantity(uncertainty
|
|
59
|
+
uncertainty = Quantity(uncertainty)
|
|
54
60
|
try:
|
|
55
61
|
assert self.shape == uncertainty.shape
|
|
56
62
|
except AssertionError:
|
|
@@ -78,7 +84,6 @@ class UncertainQuantity(Quantity):
|
|
|
78
84
|
Quantity(
|
|
79
85
|
np.zeros(self.shape, self.dtype),
|
|
80
86
|
self._dimensionality,
|
|
81
|
-
copy=False
|
|
82
87
|
)
|
|
83
88
|
)
|
|
84
89
|
|
|
@@ -87,7 +92,7 @@ class UncertainQuantity(Quantity):
|
|
|
87
92
|
def __add__(self, other):
|
|
88
93
|
res = super().__add__(other)
|
|
89
94
|
u = (self.uncertainty**2+other.uncertainty**2)**0.5
|
|
90
|
-
return UncertainQuantity(res, uncertainty=u
|
|
95
|
+
return UncertainQuantity(res, uncertainty=u)
|
|
91
96
|
|
|
92
97
|
@with_doc(Quantity.__radd__, use_header=False)
|
|
93
98
|
@scale_other_units
|
|
@@ -99,13 +104,13 @@ class UncertainQuantity(Quantity):
|
|
|
99
104
|
def __sub__(self, other):
|
|
100
105
|
res = super().__sub__(other)
|
|
101
106
|
u = (self.uncertainty**2+other.uncertainty**2)**0.5
|
|
102
|
-
return UncertainQuantity(res, uncertainty=u
|
|
107
|
+
return UncertainQuantity(res, uncertainty=u)
|
|
103
108
|
|
|
104
109
|
@with_doc(Quantity.__rsub__, use_header=False)
|
|
105
110
|
@scale_other_units
|
|
106
111
|
def __rsub__(self, other):
|
|
107
112
|
if not isinstance(other, UncertainQuantity):
|
|
108
|
-
other = UncertainQuantity(other
|
|
113
|
+
other = UncertainQuantity(other)
|
|
109
114
|
|
|
110
115
|
return UncertainQuantity.__sub__(other, self)
|
|
111
116
|
|
|
@@ -118,7 +123,7 @@ class UncertainQuantity(Quantity):
|
|
|
118
123
|
ru = (sru**2+oru**2)**0.5
|
|
119
124
|
u = res.view(Quantity) * ru
|
|
120
125
|
except AttributeError:
|
|
121
|
-
other = np.
|
|
126
|
+
other = np.asanyarray(other)
|
|
122
127
|
u = (self.uncertainty**2*other**2)**0.5
|
|
123
128
|
|
|
124
129
|
res._uncertainty = u
|
|
@@ -140,7 +145,7 @@ class UncertainQuantity(Quantity):
|
|
|
140
145
|
ru = (sru**2+oru**2)**0.5
|
|
141
146
|
u = res.view(Quantity) * ru
|
|
142
147
|
except AttributeError:
|
|
143
|
-
other = np.
|
|
148
|
+
other = np.asanyarray(other)
|
|
144
149
|
u = (self.uncertainty**2/other**2)**0.5
|
|
145
150
|
|
|
146
151
|
res._uncertainty = u
|
|
@@ -150,7 +155,7 @@ class UncertainQuantity(Quantity):
|
|
|
150
155
|
def __rtruediv__(self, other):
|
|
151
156
|
temp = UncertainQuantity(
|
|
152
157
|
1/self.magnitude, self.dimensionality**-1,
|
|
153
|
-
self.relative_uncertainty/self.magnitude
|
|
158
|
+
self.relative_uncertainty/self.magnitude
|
|
154
159
|
)
|
|
155
160
|
return other * temp
|
|
156
161
|
|
|
@@ -165,8 +170,7 @@ class UncertainQuantity(Quantity):
|
|
|
165
170
|
return UncertainQuantity(
|
|
166
171
|
self.magnitude[key],
|
|
167
172
|
self._dimensionality,
|
|
168
|
-
self.uncertainty[key]
|
|
169
|
-
copy=False
|
|
173
|
+
self.uncertainty[key]
|
|
170
174
|
)
|
|
171
175
|
|
|
172
176
|
@with_doc(Quantity.__repr__, use_header=False)
|
|
@@ -198,8 +202,7 @@ class UncertainQuantity(Quantity):
|
|
|
198
202
|
return UncertainQuantity(
|
|
199
203
|
self.magnitude.sum(axis, dtype, out),
|
|
200
204
|
self.dimensionality,
|
|
201
|
-
(np.sum(self.uncertainty.magnitude**2, axis))**0.5
|
|
202
|
-
copy=False
|
|
205
|
+
(np.sum(self.uncertainty.magnitude**2, axis))**0.5
|
|
203
206
|
)
|
|
204
207
|
|
|
205
208
|
@with_doc(np.nansum)
|
|
@@ -207,8 +210,7 @@ class UncertainQuantity(Quantity):
|
|
|
207
210
|
return UncertainQuantity(
|
|
208
211
|
np.nansum(self.magnitude, axis, dtype, out),
|
|
209
212
|
self.dimensionality,
|
|
210
|
-
(np.nansum(self.uncertainty.magnitude**2, axis))**0.5
|
|
211
|
-
copy=False
|
|
213
|
+
(np.nansum(self.uncertainty.magnitude**2, axis))**0.5
|
|
212
214
|
)
|
|
213
215
|
|
|
214
216
|
@with_doc(np.ndarray.mean)
|
|
@@ -216,8 +218,8 @@ class UncertainQuantity(Quantity):
|
|
|
216
218
|
return UncertainQuantity(
|
|
217
219
|
self.magnitude.mean(axis, dtype, out),
|
|
218
220
|
self.dimensionality,
|
|
219
|
-
((1.0/np.size(self,axis))**2 * np.sum(self.uncertainty.magnitude**2, axis))**0.5
|
|
220
|
-
|
|
221
|
+
((1.0/np.size(self,axis))**2 * np.sum(self.uncertainty.magnitude**2, axis))**0.5
|
|
222
|
+
)
|
|
221
223
|
|
|
222
224
|
@with_doc(np.nanmean)
|
|
223
225
|
def nanmean(self, axis=None, dtype=None, out=None):
|
|
@@ -225,8 +227,8 @@ class UncertainQuantity(Quantity):
|
|
|
225
227
|
return UncertainQuantity(
|
|
226
228
|
np.nanmean(self.magnitude, axis, dtype, out),
|
|
227
229
|
self.dimensionality,
|
|
228
|
-
((1.0/size)**2 * np.nansum(np.nan_to_num(self.uncertainty.magnitude)**2, axis))**0.5
|
|
229
|
-
|
|
230
|
+
((1.0/size)**2 * np.nansum(np.nan_to_num(self.uncertainty.magnitude)**2, axis))**0.5
|
|
231
|
+
)
|
|
230
232
|
|
|
231
233
|
@with_doc(np.sqrt)
|
|
232
234
|
def sqrt(self, out=None):
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|