aggregationslib 0.1.5.dev4__py3-none-any.whl → 0.1.5.dev6__py3-none-any.whl

aggregationslib/aggregations.py

@@ -468,28 +468,28 @@ class A_oln:
     """
 
     name = 'oln'
-    valid_params = ['n']
+    valid_params = ['p']
 
-    def __init__(self, n):
-        self.__n = n
+    def __init__(self, p):
+        self.__p = p
 
     def __call__(self, array):
         if np.ndim(array) != 1:
             raise ValueError("y must be 1 dimensional array")
-        if len(array) <= self.__n * 2:
+        if len(array) <= self.__p * 2:
             return np.mean(array)
         else:
-            d = np.sort(array)[self.__n:-self.__n]
+            d = np.sort(array)[self.__p:-self.__p]
             return np.mean(d)
 
     def __repr__(self):
-        return f"A_oln(n={self.__n})"
+        return f"A_oln(n={self.__p})"
 
     def __str__(self):
-        return f"A_oln({self.__n})"
+        return f"A_oln({self.__p})"
 
     def toLatex(self, params: str):
-        return f"A_{{oln}}^{{n={self.__n}}}({params})"
+        return f"A_{{oln}}^{{p={self.__p}}}({params})"
 
 
 # TODO test this aggregation

{aggregationslib-0.1.5.dev4.dist-info → aggregationslib-0.1.5.dev6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aggregationslib
-Version: 0.1.5.dev4
+Version: 0.1.5.dev6
 Summary: Python implementation of Arithmetic, quasi arithmetic and other aggregating functions
 Author: wgalka
 Project-URL: Homepage, https://github.com/wgalka/Means
@@ -63,15 +63,6 @@ or ‘**repr**\ ()’ methods.
    print(func3.__repr__()) # function parameters are printed in order: func1, func2
    >>>A_arpw(r=3)
 
-``exponential(y, r=1)`` is given by equation
-
-.. math::
-
-
-   A_6^{(r)}(x_1,...,x_n)= \frac{1}{r}\ln
-   \Big(\frac{1}{n} \sum \limits_{k=1}^{n} e^{rx_k}\Big), where
-   r \in \mathbb{R}, r \neq 0
-
 Aggregation functions
 ---------------------
 
@@ -139,25 +130,30 @@ where r=-1; - Geometric Mean obtained as the limit
 
    A_{ex}^{(r)}(x_1,...,x_n)= \frac{1}{r}\ln
    \Big(\frac{1}{n} \sum \limits_{k=1}^{n} e^{rx_k}\Big), \text{where
-   } r \in \mathbb{R}$, $r \neq 0
+   } r \in \mathbb{R}, r \neq 0
 
 :math:`\mathbf{A_{lm}}` **- Lehmer mean**
 
-.. math:: A_{lm}(x_1,...,x_n)= \frac{\sum \limits_{k=1}^{n}x_k^r}{\sum \limits_{k=1}^{n}x_k^{r-1}} 
+.. math::
+
+   A_{lm}(x_1,...,x_n)= \begin{cases}
+   0, & r\leq 1, \exists_{1 \leq k \leq n} x^{k} = 0 \\
+   \frac{\sum \limits_{k=1}^{n}x_k^r}{\sum \limits_{k=1}^{n}x_k^{r-1}}, & \text{otherwise}
+   \end{cases}
 
 :math:`\mathbf{A_{amn}^{(p)}}` **- Arithmetic minimum mean**
 
 .. math::
 
    A_{amn}^{(p)}(x_1,...,x_n)=\frac{p}{n}\sum \limits_{k=1}^{n} x_k+
-   (1-p) \min \limits_{1 \leq k \leq n}x_k,
+   (1-p) \min \limits_{1 \leq k \leq n}x_k, p \in [0, 1]
 
 :math:`\mathbf{A_{amx}^{(p)}}` **- Arithmetic maximum mean**
 
 .. math::
 
    A_{amx}^{(p)}(x_1,...,x_n)=\frac{p}{n}\sum \limits_{k=1}^{n} x_k+
-   (1-p) \max \limits_{1\leq k \leq n}x_k,
+   (1-p) \max \limits_{1\leq k \leq n}x_k, p \in [0, 1]
 
 OWA
 ~~~
@@ -184,13 +180,11 @@ case of calculating the arithmetic mean of the given values.
 
 We can specify how many greatest and smallest records remove
 
-.. math::  A_{oln}^{(p)}(x_1,\dots,x_n) = \frac{1}{n-2p} \sum \limits_{k=p}^{n-p}  y_k, \quad \text{where } \{y_1, \dots, y_n\} = \{x_1, \dots, x_n\},\ y_1 \leq y_2 \leq \dots \leq y_n.
+.. math::  A_{oln}^{(p)}(x_1,\dots,x_n) = \frac{1}{n-2p} \sum \limits_{k=p+1}^{n-p}  y_k, \quad \text{where } \{y_1, \dots, y_n\} = \{x_1, \dots, x_n\},\ y_1 \leq y_2 \leq \dots \leq y_n, p \in \mathbb{N}, p\geq 1
 
 --------------
 
-:math:`\mathbf{A_{ln}}` **- Logaritmic aggregation**
-
-https://www.researchgate.net/publication/228886844_Logarithmic_mean_for_several_arguments
+:math:`\mathbf{A_{ln}}` **- Logaritmic aggregation [2]**
 
 .. math::
 
@@ -209,3 +203,5 @@ References
 
 1. Beliakov, G., Bustince, H., and Calvo, T.: A practical Guide to
    Averaging Functions. Berlin: Springer Vol. 329, 2016.
+2. `Mustonen, Seppo. (2010). Logarithmic mean for several
+   arguments. <https://www.researchgate.net/publication/228886844_Logarithmic_mean_for_several_arguments>`__

{aggregationslib-0.1.5.dev4.dist-info → aggregationslib-0.1.5.dev6.dist-info}/RECORD

@@ -1,14 +1,14 @@
 aggregationslib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aggregationslib/aggregation.py,sha256=xByHAEHVtu3PdnK21dJz9bayKqEO9_8xPjDGQytMpSY,4565
-aggregationslib/aggregations.py,sha256=CPkielX2iM_wVXN3z0SfNE4Dxs1HMeX3R5h9kx2la0U,14644
+aggregationslib/aggregations.py,sha256=6EfXEnNvqIWNEvbTnhsMM37vHYnsRft6HnO1MZxXy2I,14644
 aggregationslib/decimalaggregations.py,sha256=FYwro4KcojPH7ZMAEcKoE7MHN_1ojaTDY0UkEAzJN0M,5351
 aggregationslib/example.py,sha256=4y3caiSBq4jkqz88Qan1m0LB389TXvlf7VSOPC_1Cj4,149
 aggregationslib/purepython.py,sha256=Ov7AuBHLzoebS7HwTsDo8Ceed5pMzn3i71uevHnHbno,557
 aggregationslib/conjuctive/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aggregationslib/conjuctive/purepython.py,sha256=f7YOyrEvaTiBhWDyJrKPbWrym2PGFYIkTqfE2u1lOvk,82
 aggregationslib/disjunctive/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aggregationslib-0.1.5.dev4.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aggregationslib-0.1.5.dev4.dist-info/METADATA,sha256=7oV8Tv5nA9GpbcYwFdzuNjtGC_aCeXiPjN_5hvwBsE4,6005
-aggregationslib-0.1.5.dev4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aggregationslib-0.1.5.dev4.dist-info/top_level.txt,sha256=aAqYX4rNyBs40QOh2hc-jTE08IsMq0haGyyy7-GSdUQ,16
-aggregationslib-0.1.5.dev4.dist-info/RECORD,,
+aggregationslib-0.1.5.dev6.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aggregationslib-0.1.5.dev6.dist-info/METADATA,sha256=A58xQMbMOFPfhQ_i9-3QroHQQ57C7_CcHuGbKuLP3Zc,6053
+aggregationslib-0.1.5.dev6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aggregationslib-0.1.5.dev6.dist-info/top_level.txt,sha256=aAqYX4rNyBs40QOh2hc-jTE08IsMq0haGyyy7-GSdUQ,16
+aggregationslib-0.1.5.dev6.dist-info/RECORD,,