richvalues 4.2.22__tar.gz → 4.2.24__tar.gz

{richvalues-4.2.22/richvalues.egg-info → richvalues-4.2.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: richvalues
-Version: 4.2.22
+Version: 4.2.24
 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.22 → richvalues-4.2.24}/pyproject.toml

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

{richvalues-4.2.22 → richvalues-4.2.24}/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.24'
 __author__ = 'Andrés Megías Toledano'
 
 import copy
@@ -3334,7 +3334,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
@@ -3810,7 +3810,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
         
@@ -4732,9 +4733,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 +4831,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 +5083,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 +5167,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 +5271,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 +5298,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 +5332,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]

{richvalues-4.2.22 → richvalues-4.2.24/richvalues.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: richvalues
-Version: 4.2.22
+Version: 4.2.24
 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.22 → richvalues-4.2.24}/setup.py

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