aggregationslib 0.1.5.dev5__tar.gz → 0.1.5.dev6__tar.gz

{aggregationslib-0.1.5.dev5/aggregationslib.egg-info → aggregationslib-0.1.5.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aggregationslib
-Version: 0.1.5.dev5
+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
@@ -134,21 +134,26 @@ where r=-1; - Geometric Mean obtained as the limit
 
 :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
 ~~~
@@ -175,7 +180,7 @@ 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
 
 --------------
 

{aggregationslib-0.1.5.dev5 → aggregationslib-0.1.5.dev6}/README.md

@@ -105,17 +105,20 @@ $$A_{ex}^{(r)}(x_1,...,x_n)= \frac{1}{r}\ln
 
 $\mathbf{A_{lm}}$ **- Lehmer mean**
 
-$$A_{lm}(x_1,...,x_n)= \frac{\sum \limits_{k=1}^{n}x_k^r}{\sum \limits_{k=1}^{n}x_k^{r-1}} $$
+$$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}$$
 
 $\mathbf{A_{amn}^{(p)}}$ **- Arithmetic minimum mean**
 
 $$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]$$
 
 $\mathbf{A_{amx}^{(p)}}$ **- Arithmetic maximum mean**
 
 $$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
@@ -140,7 +143,7 @@ $\mathbf{A_{oln}^{(p)}}$ **- Olimpic aggregation**
 
 We can specify how many greatest and smallest records remove
 
-$$ 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.$$
+$$ 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$$
 
 --------------------
 

{aggregationslib-0.1.5.dev5 → aggregationslib-0.1.5.dev6}/README.rst

@@ -116,21 +116,26 @@ where r=-1; - Geometric Mean obtained as the limit
 
 :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
 ~~~
@@ -157,7 +162,7 @@ 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
 
 --------------
 

{aggregationslib-0.1.5.dev5 → aggregationslib-0.1.5.dev6}/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.dev5 → aggregationslib-0.1.5.dev6/aggregationslib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aggregationslib
-Version: 0.1.5.dev5
+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
@@ -134,21 +134,26 @@ where r=-1; - Geometric Mean obtained as the limit
 
 :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
 ~~~
@@ -175,7 +180,7 @@ 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
 
 --------------
 

aggregationslib-0.1.5.dev6/commands.md

@@ -0,0 +1,2 @@
+pandoc README.md -o README.rst
+

aggregationslib-0.1.5.dev5/commands.md

@@ -1 +0,0 @@
-pandoc README.md -o README.rst