richvalues 4.2.23__tar.gz → 4.2.25__tar.gz

{richvalues-4.2.23/richvalues.egg-info → richvalues-4.2.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: richvalues
-Version: 4.2.23
+Version: 4.2.25
 Summary: Python package for working with uncertainties and upper/lower limits
 Home-page: https://github.com/andresmegias/richvalues/
 Author: Andrés Megías Toledano

{richvalues-4.2.23 → richvalues-4.2.25}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "richvalues"
-version = "4.2.23"
+version = "4.2.25"
 description = "Python package for working with uncertainties and upper/lower limits"
 license = {file="LICENSE"}
 authors = [{name="Andrés Megías Toledano"}]

{richvalues-4.2.23 → richvalues-4.2.25}/richvalues/__init__.py

@@ -37,7 +37,7 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 """
 
-__version__ = '4.2.22'
+__version__ = '4.2.25'
 __author__ = 'Andrés Megías Toledano'
 
 import copy
@@ -633,7 +633,7 @@ class RichValue():
                         is_uplim = True
                     else:
                         main = np.nan
-                        unc = [np.nan]*2   
+                        unc = [np.nan]*2
         
         if np.isnan(main):
             is_uplim, is_lolim, is_range = False, False, False
@@ -876,7 +876,7 @@ class RichValue():
         """Constant value."""
         isconst = self.is_exact and self.domain[0] == self.domain[1]
         return isconst
-    @property    
+    @property
     def center(self):
         """Central value."""
         if self.is_centered or self.is_exact:
@@ -885,7 +885,7 @@ class RichValue():
                 cent = round(cent)
         else:
             cent = np.nan
-        return cent  
+        return cent
     @property
     def unc_T(self):
         """Uncertainties with shape (2,1)."""
@@ -915,7 +915,7 @@ class RichValue():
         else:
             s_n = [np.nan]*2
         return s_n
-    @property    
+    @property
     def ampl(self):
         """Amplitudes."""
         m, b = self.main, self.domain
@@ -1063,7 +1063,7 @@ class RichValue():
                 m = float(np.median(sample))
         else:
             m = np.nan
-        return m         
+        return m
     
     def mean(self, num_points=int(1e4), sigmas=8.):
         """Mean of the PDF of the rich value."""
@@ -1445,7 +1445,7 @@ class RichValue():
                             if 'e' in y:
                                 y, a = y.split('e')
                                 if 'e' in dy:
-                                    dy, a = dy.split('e') 
+                                    dy, a = dy.split('e')
                                 else:
                                     a = 0
                             else:
@@ -1479,10 +1479,10 @@ class RichValue():
                 else:
                     if is_lolim:
                         symbol = '>'
-                        y = int(np.floor(x)) if is_int and a > num_sf else x  
+                        y = int(np.floor(x)) if is_int and a > num_sf else x
                     elif is_uplim:
                         symbol = '<'
-                        y = int(np.ceil(x)) if is_int and a > num_sf else x  
+                        y = int(np.ceil(x)) if is_int and a > num_sf else x
                     y = round_sf(y, num_sf, min_exp, extra_sf_lim)
                     if 'e' in y:
                         y, a = y.split('e')
@@ -1790,7 +1790,7 @@ class RichValue():
         if domain[0] > 0. and other_.sign() != -1:
             domain[0] = 0.
         if domain[1] < 0. and other_.sign() != 1:
-            domain[1] = 0.    
+            domain[1] = 0.
         rvalue = function_with_rich_values('{}%{}', [self, other_],
                                domain=domain, is_domain_cyclic=True)
         return rvalue
@@ -1839,11 +1839,13 @@ class RichValue():
                                      domain=domain, is_int=is_int)
             else:
                 other_ = other if type(other) is RichValue else RichValue(other)
+                domain = None
                 if self.main != 0.:
                     if type(other) is not RichValue and other%2 == 0.:
                         domain = [0., np.inf]
-                    rvalue = function_with_rich_values(lambda a,b: a**b,
-                                                [self, other_], domain=domain)
+                    with np.errstate(over='ignore', invalid='ignore'):
+                        rvalue = function_with_rich_values(lambda a,b: a**b,
+                                                    [self, other_], domain=domain)
                 else:
                     rvalue = RichValue(0., domain=domain, is_int=self.is_int)
             rvalue.num_sf = self.num_sf
@@ -2202,17 +2204,17 @@ class RichArray(np.ndarray):
         return np.array([x.main for x in self.flat]).reshape(self.shape)
     @property
     def uncs(self):
-        return np.array([x.unc for x in self.flat]).reshape([*self.shape,2]) 
+        return np.array([x.unc for x in self.flat]).reshape([*self.shape,2])
     @property
     def are_lolims(self):
         return np.array([x.is_lolim for x in self.flat]).reshape(self.shape)
     @property
     def are_uplims(self):
-        return np.array([x.is_uplim for x in self.flat]).reshape(self.shape) 
+        return np.array([x.is_uplim for x in self.flat]).reshape(self.shape)
     @property
     def are_ranges(self):
         return np.array([x.is_range for x in self.flat]).reshape(self.shape)
-    @property 
+    @property
     def domains(self):
         return np.array([x.domain for x in self.flat]).reshape([*self.shape,2])
     @property
@@ -2253,7 +2255,7 @@ class RichArray(np.ndarray):
         return np.array([x.is_inf for x in self.flat]).reshape(self.shape)
     @property
     def centers(self):
-        return np.array([x.center for x in self.flat]).reshape(self.shape) 
+        return np.array([x.center for x in self.flat]).reshape(self.shape)
     @property
     def rel_uncs(self):
         return (np.array([x.rel_unc for x in self.flat])
@@ -2321,27 +2323,27 @@ class RichArray(np.ndarray):
     
     def medians(self, num_points=None):
         return np.array([x.median(num_points)
-                         for x in self.flat]).reshape(self.shape) 
+                         for x in self.flat]).reshape(self.shape)
 
     def means(self, num_points=int(1e4), sigmas=8.):
         return np.array([x.mean(num_points, sigmas)
-                         for x in self.flat]).reshape(self.shape) 
+                         for x in self.flat]).reshape(self.shape)
 
     def modes(self, num_points=int(1e4), sigmas=8.):
         return np.array([x.mode(num_points, sigmas)
-                         for x in self.flat]).reshape(self.shape) 
+                         for x in self.flat]).reshape(self.shape)
 
     def variances(self, num_points=int(1e4), sigmas=8.):
         return np.array([x.var(num_points, sigmas)
-                         for x in self.flat]).reshape(self.shape) 
+                         for x in self.flat]).reshape(self.shape)
 
     def stds(self, num_points=int(1e4), sigmas=8.):
         return np.array([x.std(num_points, sigmas)
-                         for x in self.flat]).reshape(self.shape) 
+                         for x in self.flat]).reshape(self.shape)
     
     def moments(self, n, central=True, standarized=False):
         return np.array([x.moments(n, central, standarized)
-                                   for x in self.flat]).reshape(self.shape) 
+                                   for x in self.flat]).reshape(self.shape)
     
     def set_params(self, params):
         """Set the rich value parameters of each entry of the rich array."""
@@ -2350,7 +2352,7 @@ class RichArray(np.ndarray):
                          'minimum exponent for scientific notation': 'min_exp',
                          'maximum number of decimals to use parenthesis': 'max_dec',
                          'limit for extra significant figure': 'extra_sf_lim'}
-        attributes = ['domain'] + list(abbreviations.values()) 
+        attributes = ['domain'] + list(abbreviations.values())
         for entry in abbreviations:
             name = abbreviations[entry]
             if entry in params:
@@ -2480,7 +2482,7 @@ class RichDataFrame(pd.DataFrame):
         df = pd.DataFrame(data, self.index, self.columns)
         return df
 
-    @property    
+    @property
     def mains(self): return self._property('mains')
     @property
     def uncs(self): return self._property2('uncs')
@@ -2982,14 +2984,14 @@ class ComplexRichValue():
         self.imag.num_sf = x
         
     @property
-    def min_exp(self): return round(np.mean([self.real.min_exp, self.imag.min_exp]))  
+    def min_exp(self): return round(np.mean([self.real.min_exp, self.imag.min_exp]))
     @min_exp.setter
     def min_exp(self, x):
         self.real.min_exp = x
         self.imag.min_exp = x
         
     @property
-    def max_dec(self): return min(self.real.max_dec, self.imag.max_dec)  
+    def max_dec(self): return min(self.real.max_dec, self.imag.max_dec)
     @max_dec.setter
     def max_dec(self, x):
         self.real.max_dec = x
@@ -3029,7 +3031,7 @@ class ComplexRichValue():
     def main(self):
         """Main value."""
         x = self.real.main + 1j*self.imag.main
-        return x 
+        return x
 
     @property
     def unc(self):
@@ -3247,7 +3249,7 @@ class ComplexRichValue():
         """Apply a function to the rich value."""
         return function_with_rich_values(function, self, **kwargs)
     
-    # Instance variable acronyms.  
+    # Instance variable acronyms.
 
     @property
     def real_part(self): return self.real
@@ -3334,7 +3336,7 @@ def multiply_rich_values(x, y):
         z = RichValue(z, dz, domain=domain, is_int=is_int)
     else:
         z = function_with_rich_values(lambda a,b: a*b, [x, y], domain=domain,
-                                    is_vectorizable=True)
+                                      is_vectorizable=True)
     z.num_sf = num_sf
     z.min_exp = min_exp
     z.max_dec = max_dec
@@ -3556,7 +3558,7 @@ def parse_as_rich_value(text, abbreviations={}, use_default_extra_sf_lim=False):
     domain = read_domain(text, abbreviations)
     if domain is not None:
         text = text.split('[')[0][:-1]
-    if not '--' in text:    
+    if not '--' in text:
         if text.startswith('+'):
             text = text[1:]
         if ' e' in text:
@@ -3674,11 +3676,11 @@ def parse_as_rich_value(text, abbreviations={}, use_default_extra_sf_lim=False):
             if mantissa <= default_extra_sf_lim:
                 default_num_sf = defaultparams['number of significant figures']
                 if num_sf < default_num_sf + 1:
-                    extra_sf_lim = mantissa   
+                    extra_sf_lim = mantissa
         x = x.replace('e0','')
         main = _eval(x)
         unc = [_eval(dx1), _eval(dx2)]
-        is_range = False     
+        is_range = False
     else:
         text = text.replace(' --','--').replace('-- ','--')
         text1, text2 = text.split('--')
@@ -3789,7 +3791,7 @@ def rich_value(text=None, domain=None, is_int=None, pdf=None, support=None,
                 imag = rich_value(text_imag, *args)
             else:
                 text = text.replace(' + ', '+').replace(' - ', '-')
-                val = complex(text) 
+                val = complex(text)
                 real = val.real
                 imag = val.imag
             rvalue = ComplexRichValue(real, imag, domain, is_int)
@@ -3810,7 +3812,8 @@ def rich_value(text=None, domain=None, is_int=None, pdf=None, support=None,
         sample = sample_from_pdf(pdf_, size=4e4, support=support)
         if is_int:
             sample = np.round(sample).astype(int)
-        rvalue = evaluate_sample(sample, domain, consider_intervs=consider_intervs)
+        rvalue = evaluate_sample(sample, domain=domain,
+                                 consider_intervs=consider_intervs)
         pdf_info['function'] = pdf_
         rvalue.__dict__['pdf_info'] = pdf_info
         
@@ -4682,7 +4685,7 @@ def add_zero_infs(interval, zero_log, inf_log):
     elif x2 > 0 and x2 > 10**inf_log:
         x2 = np.inf
     new_interval = [x1, x2]
-    return new_interval 
+    return new_interval
 
 def remove_zero_infs(interval, zero_log, inf_log):
     """Replace 0 and infinity for the given values in the input interval."""
@@ -4732,9 +4735,9 @@ def evaluate_domain_sample(sample):
     domain = [float(domain1), float(domain2)]
     return domain
 
-def evaluate_sample(sample, domain=None, function=None, args=None, is_int=None,
-            len_samples=None, is_vectorizable=False, consider_intervs=None,
-            is_domain_cyclic=False, save_pdf=None, **kwargs):
+def evaluate_sample(sample, function=None, args=None, len_samples=None,
+                    domain=None, consider_intervs=None, is_vectorizable=False,
+                    is_domain_cyclic=False, is_int=None, save_pdf=None, **kwargs):
     """
     Interpret the given distribution as a rich value.
 
@@ -4830,8 +4833,10 @@ def evaluate_sample(sample, domain=None, function=None, args=None, is_int=None,
             function_imag = lambda x: np.imag(function(x))
         fargs =  (args, is_int, len_samples, is_vectorizable, consider_intervs,
                  is_domain_cyclic, save_pdf)
-        real = evaluate_sample(sample.real, domain, function_real, *fargs)
-        imag = evaluate_sample(sample.imag, domain, function_imag, *fargs)
+        real = evaluate_sample(sample.real, domain=domain,
+                               function=function_real, *fargs)
+        imag = evaluate_sample(sample.imag, domain=domain,
+                               function=function_imag, *fargs)
         rvalue = ComplexRichValue(real, imag)
         if type(input_function) is str:
             rvalue.__dict__['variables'] = variables
@@ -5080,8 +5085,8 @@ def evaluate_sample(sample, domain=None, function=None, args=None, is_int=None,
 
 def function_with_rich_values(function, args, len_samples=None, domain=None,
                               consider_intervs=None, is_vectorizable=False,
-                              is_domain_cyclic=False, save_pdf=None, is_int=None,
-                              **kwargs):
+                              is_domain_cyclic=False, is_int=None,
+                              save_pdf=None, **kwargs):
     """
     Apply a function to the input rich values.
 
@@ -5164,7 +5169,7 @@ def function_with_rich_values(function, args, len_samples=None, domain=None,
         for k in range(output_size):
             sample = [(function() if output_size == 1 else function()[k])
                      for i in range(len_samples)]
-            rvalue = evaluate_sample(sample, domain)
+            rvalue = evaluate_sample(sample, domain=domain)
             output += [rvalue]
         if output_size == 1 and output_type is not list:
             output = output[0]
@@ -5268,9 +5273,9 @@ def function_with_rich_values(function, args, len_samples=None, domain=None,
             if output_size > 1:
                 y = y[k]
             return y
-        rval_k = evaluate_sample(sample[:,k], domains[k], function_k, args, is_int,
-                                 len_samples, is_vectorizable, consider_intervs,
-                                 are_domains_periodic[k], save_pdf)
+        rval_k = evaluate_sample(sample[:,k], function_k, args, len_samples,
+                                 domains[k], consider_intervs, is_vectorizable,
+                                 are_domains_periodic[k], is_int, save_pdf)
         rval_k.num_sf = num_sf
         rval_k.min_exp = min_exp
         rval_k.max_dec = max_dec
@@ -5295,7 +5300,7 @@ def function_with_rich_values(function, args, len_samples=None, domain=None,
             
     return output
 
-def function_with_rich_arrays(function, args, elementwise=True, **kwargs):
+def function_with_rich_arrays(function, args, elementwise=False, **kwargs):
     """
     Apply a function to the input rich arrays.
     (abbreviation: array_function)
@@ -5329,13 +5334,13 @@ def function_with_rich_arrays(function, args, elementwise=True, **kwargs):
         domain = None
     sample = distr_sample_with_rich_arrays(function, args, elementwise, **kwargs)
     if len(sample.shape) == 1:
-        output = evaluate_sample(sample, domain, function, args, **kwargs)
+        output = evaluate_sample(sample, function, args, domain=domain, **kwargs)
     else:
         output_size = sample.shape[1]
         output = []
         for k in range(output_size):
             function_k = lambda *args: function(args)[k]
-            rval_k = evaluate_sample(sample[:,k], domain, function_k, **kwargs)
+            rval_k = evaluate_sample(sample[:,k], function_k, domain=domain, **kwargs)
             output += [rval_k]
         if type(args) not in (tuple, list):
             args = [args]
@@ -5758,7 +5763,7 @@ def curve_fit(x, y, function, guess, num_samples=3000,
         lim1, lim2 = 0.2, 1.2
         if disp_coef <= lim1:
             frac1 = 1.
-        elif disp_coef < lim2: 
+        elif disp_coef < lim2:
             frac1 = 1. - disp_coef / (lim2 - lim1)
         else:
             frac1 = 0.
@@ -5771,7 +5776,7 @@ def curve_fit(x, y, function, guess, num_samples=3000,
     result = {'parameters': params_fit, 'dispersion': dispersion, 'loss': loss,
               'parameters samples': samples, 'dispersion sample': dispersions,
               'loss sample': losses, 'number of fails': num_fails}
-    return result   
+    return result
 
 def point_fit(y, function, guess, num_samples=3000,
               loss=lambda a,b: (a-b)**2, lim_loss_factor=4.,
@@ -5847,7 +5852,7 @@ def point_fit(y, function, guess, num_samples=3000,
         lim1, lim2 = 0.2, 1.2
         if disp_coef <= lim1:
             frac1 = 1.
-        elif disp_coef < lim2: 
+        elif disp_coef < lim2:
             frac1 = 1. - disp_coef / (lim2 - lim1)
         else:
             frac1 = 0.
@@ -6065,4 +6070,4 @@ array_distr_sample = array_distribution_sample = distr_sample_with_rich_arrays
 center_and_uncertainties = center_and_uncs
 is_not_a_number = is_nan = isnan
 is_infinite = is_inf = isinf
-is_finite = is_finite = isfinite
+is_finite = is_finite = isfinite

{richvalues-4.2.23 → richvalues-4.2.25/richvalues.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: richvalues
-Version: 4.2.23
+Version: 4.2.25
 Summary: Python package for working with uncertainties and upper/lower limits
 Home-page: https://github.com/andresmegias/richvalues/
 Author: Andrés Megías Toledano

{richvalues-4.2.23 → richvalues-4.2.25}/setup.py

@@ -5,7 +5,7 @@ with open('README.md', 'r') as file:
 
 setuptools.setup(
     name = 'richvalues',
-    version = '4.2.23',
+    version = '4.2.25',
     license = 'BSD-3-Clause',
     author = 'Andrés Megías Toledano',
     description = 'Python package for working with uncertainties and upper/lower limits',