richvalues 4.1.3__tar.gz → 4.1.5__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.
- {richvalues-4.1.3 → richvalues-4.1.5}/PKG-INFO +1 -1
- {richvalues-4.1.3 → richvalues-4.1.5}/pyproject.toml +1 -1
- {richvalues-4.1.3 → richvalues-4.1.5}/richvalues/__init__.py +13 -11
- {richvalues-4.1.3 → richvalues-4.1.5}/richvalues.egg-info/PKG-INFO +1 -1
- {richvalues-4.1.3 → richvalues-4.1.5}/setup.py +1 -1
- {richvalues-4.1.3 → richvalues-4.1.5}/LICENSE +0 -0
- {richvalues-4.1.3 → richvalues-4.1.5}/README.md +0 -0
- {richvalues-4.1.3 → richvalues-4.1.5}/richvalues.egg-info/SOURCES.txt +0 -0
- {richvalues-4.1.3 → richvalues-4.1.5}/richvalues.egg-info/dependency_links.txt +0 -0
- {richvalues-4.1.3 → richvalues-4.1.5}/richvalues.egg-info/requires.txt +0 -0
- {richvalues-4.1.3 → richvalues-4.1.5}/richvalues.egg-info/top_level.txt +0 -0
- {richvalues-4.1.3 → richvalues-4.1.5}/setup.cfg +0 -0
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|
4
4
|
|
5
5
|
[project]
|
6
6
|
name = "richvalues"
|
7
|
-
version = "4.1.
|
7
|
+
version = "4.1.5"
|
8
8
|
description = "Python library for working with uncertainties and upper/lower limits"
|
9
9
|
license = {file="LICENSE"}
|
10
10
|
authors = [{name="Andrés Megías Toledano"}]
|
@@ -37,7 +37,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
37
37
|
POSSIBILITY OF SUCH DAMAGE.
|
38
38
|
"""
|
39
39
|
|
40
|
-
__version__ = '4.1.
|
40
|
+
__version__ = '4.1.5'
|
41
41
|
__author__ = 'Andrés Megías Toledano'
|
42
42
|
|
43
43
|
import copy
|
@@ -2998,7 +2998,7 @@ def less_equiv(x, y, sigmas_interval=None, sigmas_overlap=None):
|
|
2998
2998
|
return output
|
2999
2999
|
|
3000
3000
|
def rich_value(text=None, domain=None, is_int=None, pdf=None,
|
3001
|
-
use_default_extra_sf_lim=False):
|
3001
|
+
consider_intervs=True, use_default_extra_sf_lim=False):
|
3002
3002
|
"""
|
3003
3003
|
Convert the input text to a rich value.
|
3004
3004
|
|
@@ -3016,6 +3016,10 @@ def rich_value(text=None, domain=None, is_int=None, pdf=None,
|
|
3016
3016
|
pdf : function / dict, optional
|
3017
3017
|
Probability density function (PDF) that defines the rich value. It can
|
3018
3018
|
be specified instead of the text representing the rich value.
|
3019
|
+
consider_intervs : bool, optional
|
3020
|
+
If the PDF is given, this variable determines if we consider the
|
3021
|
+
possibility that the rich value is an upper/lower limit or a finite
|
3022
|
+
interval of values. By default, it is True.
|
3019
3023
|
use_default_extra_sf_lim : bool, optional
|
3020
3024
|
If True, the default limit for extra significant figure will be used
|
3021
3025
|
instead of inferring it from the input text. This will reduce the
|
@@ -3027,8 +3031,7 @@ def rich_value(text=None, domain=None, is_int=None, pdf=None,
|
|
3027
3031
|
Resulting rich value.
|
3028
3032
|
"""
|
3029
3033
|
|
3030
|
-
if ('function' in str(type(text)) or type(text) in
|
3031
|
-
(dict, tuple, list, np.ndarray)):
|
3034
|
+
if ('function' in str(type(text)) or type(text) in (dict, tuple, list, np.ndarray)):
|
3032
3035
|
pdf = text
|
3033
3036
|
text = None
|
3034
3037
|
else:
|
@@ -3255,8 +3258,8 @@ def rich_value(text=None, domain=None, is_int=None, pdf=None,
|
|
3255
3258
|
distr = sample_from_pdf(pdf_, size=4e4, low=domain[0], high=domain[1])
|
3256
3259
|
if is_int:
|
3257
3260
|
distr = np.round(distr).astype(int)
|
3258
|
-
rvalue = evaluate_distr(distr, domain)
|
3259
|
-
x1, x2 = rvalue.interval(
|
3261
|
+
rvalue = evaluate_distr(distr, domain, consider_intervs=consider_intervs)
|
3262
|
+
x1, x2 = rvalue.interval(8.)
|
3260
3263
|
x = np.linspace(x1, x2, int(1e4))
|
3261
3264
|
y = pdf_(x)
|
3262
3265
|
norm = np.trapz(y, x)
|
@@ -4076,11 +4079,11 @@ def evaluate_distr(distr, domain=None, function=None, args=None,
|
|
4076
4079
|
rvalue.expression = expression
|
4077
4080
|
|
4078
4081
|
if save_pdf:
|
4079
|
-
x1, x2 = rvalue.interval(
|
4082
|
+
x1, x2 = rvalue.interval(8.)
|
4080
4083
|
if is_int and is_range_small:
|
4081
4084
|
bins = np.arange(x1, x2+2) - 0.5
|
4082
4085
|
else:
|
4083
|
-
num_bins = max(
|
4086
|
+
num_bins = max(120, size//100)
|
4084
4087
|
bins = np.linspace(x1, x2, num_bins)
|
4085
4088
|
probs, _ = np.histogram(distr, bins=bins, density=True)
|
4086
4089
|
values = np.mean([bins[0:-1], bins[1:]], axis=0)
|
@@ -4410,8 +4413,7 @@ def function_with_rich_values(function, args, unc_function=None,
|
|
4410
4413
|
if prop_score > lim1:
|
4411
4414
|
factor = 1. - 0.5 * (min(prop_score,20.)-lim1) / (lim2-lim1)
|
4412
4415
|
len_samples = int(factor * len_samples)
|
4413
|
-
distr = distr_with_rich_values(function, args, len_samples,
|
4414
|
-
is_vectorizable)
|
4416
|
+
distr = distr_with_rich_values(function, args, len_samples, is_vectorizable)
|
4415
4417
|
if output_size == 1 and len(distr.shape) == 1:
|
4416
4418
|
distr = np.array([distr]).transpose()
|
4417
4419
|
output = []
|
@@ -5164,4 +5166,4 @@ evaluate_distribution = evaluate_distr
|
|
5164
5166
|
center_and_uncertainties = center_and_uncs
|
5165
5167
|
is_not_a_number = is_nan = isnan
|
5166
5168
|
is_infinite = is_inf = isinf
|
5167
|
-
is_finite = is_finite = isfinite
|
5169
|
+
is_finite = is_finite = isfinite
|
@@ -5,7 +5,7 @@ with open('README.md', 'r') as file:
|
|
5
5
|
|
6
6
|
setuptools.setup(
|
7
7
|
name = 'richvalues',
|
8
|
-
version = '4.1.
|
8
|
+
version = '4.1.5',
|
9
9
|
license = 'BSD-3-Clause',
|
10
10
|
author = 'Andrés Megías Toledano',
|
11
11
|
description = 'Python library for working with uncertainties and upper/lower limits',
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|