PyPyNum 1.5.1__tar.gz → 1.5.2__tar.gz

{PyPyNum-1.5.1 → PyPyNum-1.5.2}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: PyPyNum
-Version: 1.5.1
-Summary: A Python math package written in pure Python programming language [python_requires >= 3.5]
+Version: 1.5.2
+Summary: A multifunctional mathematical calculation package written in pure Python programming language [Python>=3.5]
 Home-page: https://www.gitee.com/PythonSJL/PyPyNum
 Author: Shen Jiayi
 Author-email: 2261748025@qq.com
@@ -687,10 +687,14 @@ Description-Content-Type: text/markdown
           \|___|/                \|___|/
 ```
 
-## Version -> 1.5.1 | PyPI -> https://pypi.org/project/PyPyNum/ | Gitee -> https://www.gitee.com/PythonSJL/PyPyNum
+## Version -> 1.5.2 | PyPI -> https://pypi.org/project/PyPyNum/ | Gitee -> https://www.gitee.com/PythonSJL/PyPyNum
 
 ![LOGO](PyPyNum.png)
 
+PyPI上无法显示logo，可以在Gitee中查看。
+
+The logo cannot be displayed on PyPI, it can be viewed in Gitee.
+
 ### 介绍
 
 #### Introduction
@@ -702,20 +706,27 @@ Description-Content-Type: text/markdown
 + 如需联系，QQ 2261748025 （Py𝙿𝚢𝚝𝚑𝚘𝚗-水晶兰）
 + If you need to contact, QQ 2261748025 (Py𝙿𝚢𝚝𝚑𝚘𝚗-水晶兰)
 
-### PyPyNum的Zen
+### PyPyNum的Zen（预览）
 
-#### The Zen of PyPyNum
+#### The Zen of PyPyNum (Preview)
 
 ```
     The Zen of PyPyNum, by Shen Jiayi
 
 This is a math package written purely in Python.
 
-... (Do you want to see the entire content?
-Then enter "from pypynum import this" on your
+Elegant is superior to clunky.
+Clarity trumps obscurity.
+Straightforwardness is preferred over convolution.
+Sophisticated is better than overcomplicated.
+Flat structure beats nested hierarchies.
+Sparse code wins over bloated ones.
+
+... (Do you want to view all the content?
+Enter "from pypynum import this" in your
 Python interpreter and run it!)
 
-                                December 27, 2023
+                                        February 27, 2024
 ```
 
 ### 与上一个版本相比新增功能
@@ -723,21 +734,71 @@ Python interpreter and run it!)
 #### New features compared to the previous version
 
 ```
+!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
+
+重写了PyPyNum的Zen。
+
+Rewrote the Zen of PyPyNum.
+
+!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
+
+“maths”模块的一些功能已经进行了优化，
+以实现更快的运行速度。
+
+Some functions of the "maths"
+module have been optimized to
+achieve faster running speed.
+
+!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
+
+修复了“tools”模块中的“split”函数导致
+的字符串分割错误。
+
+Fixed string splitting error
+caused by the "split" function
+in the "tools" module.
+
+!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
+
+“sequence”模块设置为每个序列返回单独
+的第n项或包含第0到第n项的列表的功能。
+
+The "sequence" module sets the
+function of returning a separate
+nth item or a list containing
+0th to nth items for each
+sequence.
+
+
+“geometric_sequence”函数补充了一个
+情况的求解函数，并且已经证实，其余两个情
+况没有解析解，需要使用多项式方程来求解。
+
+The "geometric_sequence"
+function supplements the solving
+function for one scenario, and
+it has been confirmed that there
+are no analytical solutions for
+the remaining two scenarios,
+which need to be solved using
+polynomial equations for
+implementation.
+
+!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
+
 <<<The "+" indicates the newly added method>>>
 
 maths [Mathematical functions]
     ...
-    cov(x: arr, y: arr) -> num +
-    corr_coeff(x: arr, y: arr) -> num +
-    coeff_det(x: arr, y: arr) -> num +
+    geom_mean(numbers: arr) -> num +
+    square_mean(numbers: arr) -> num +
+    harm_mean(numbers: arr) -> num +
     ...
 
 sequence [Various sequences]
     ...
-    arithmetic_sequence(*, a1=None, an=None, d=None, n=None, s=None) +
-    geometric_sequence(*, a1=None, an=None, r=None, n=None, s=None) +
-
-<<<There are three situations in the "geometric_sequence" function that have not been implemented>>>
+    recaman(n: int, single: bool = True) -> Union[int, list] +
+    ...
 ```
 
 ### 运行用时测试
@@ -978,6 +1039,9 @@ PyPyNum
             freq(data: arr) -> dict
             mode(data: arr)
             mean(numbers: arr) -> num
+            geom_mean(numbers: arr) -> num
+            square_mean(numbers: arr) -> num
+            harm_mean(numbers: arr) -> num
             var(numbers: arr) -> num
             std(numbers: arr) -> num
             cov(x: arr, y: arr) -> num
@@ -1030,11 +1094,12 @@ PyPyNum
             polynomial_regression(x: Union[list, tuple], y: Union[list, tuple], n: int = None) -> list
     ★ sequence [Various sequences]
         FUNCTIONS
-            fibonacci(n: int) -> int
-            catalan(n: int) -> int
+            fibonacci(n: int, single: bool = True) -> Union[int, list]
+            catalan(n: int, single: bool = True) -> Union[int, list]
             bernoulli(n: int, single: bool = True) -> list
-            arithmetic_sequence(*, a1=None, an=None, d=None, n=None, s=None)
-            geometric_sequence(*, a1=None, an=None, r=None, n=None, s=None)
+            recaman(n: int, single: bool = True) -> Union[int, list]
+            arithmetic_sequence(*, a1: real = None, an: real = None, d: real = None, n: real = None, s: real = None) -> dict
+            geometric_sequence(*, a1: real = None, an: real = None, r: real = None, n: real = None, s: real = None) -> dict
     ★ tools [Other useful tools]
         FUNCTIONS
             classify(array: Union[list, tuple]) -> dict

{PyPyNum-1.5.1 → PyPyNum-1.5.2}/PyPyNum.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: PyPyNum
-Version: 1.5.1
-Summary: A Python math package written in pure Python programming language [python_requires >= 3.5]
+Version: 1.5.2
+Summary: A multifunctional mathematical calculation package written in pure Python programming language [Python>=3.5]
 Home-page: https://www.gitee.com/PythonSJL/PyPyNum
 Author: Shen Jiayi
 Author-email: 2261748025@qq.com
@@ -687,10 +687,14 @@ Description-Content-Type: text/markdown
           \|___|/                \|___|/
 ```
 
-## Version -> 1.5.1 | PyPI -> https://pypi.org/project/PyPyNum/ | Gitee -> https://www.gitee.com/PythonSJL/PyPyNum
+## Version -> 1.5.2 | PyPI -> https://pypi.org/project/PyPyNum/ | Gitee -> https://www.gitee.com/PythonSJL/PyPyNum
 
 ![LOGO](PyPyNum.png)
 
+PyPI上无法显示logo，可以在Gitee中查看。
+
+The logo cannot be displayed on PyPI, it can be viewed in Gitee.
+
 ### 介绍
 
 #### Introduction
@@ -702,20 +706,27 @@ Description-Content-Type: text/markdown
 + 如需联系，QQ 2261748025 （Py𝙿𝚢𝚝𝚑𝚘𝚗-水晶兰）
 + If you need to contact, QQ 2261748025 (Py𝙿𝚢𝚝𝚑𝚘𝚗-水晶兰)
 
-### PyPyNum的Zen
+### PyPyNum的Zen（预览）
 
-#### The Zen of PyPyNum
+#### The Zen of PyPyNum (Preview)
 
 ```
     The Zen of PyPyNum, by Shen Jiayi
 
 This is a math package written purely in Python.
 
-... (Do you want to see the entire content?
-Then enter "from pypynum import this" on your
+Elegant is superior to clunky.
+Clarity trumps obscurity.
+Straightforwardness is preferred over convolution.
+Sophisticated is better than overcomplicated.
+Flat structure beats nested hierarchies.
+Sparse code wins over bloated ones.
+
+... (Do you want to view all the content?
+Enter "from pypynum import this" in your
 Python interpreter and run it!)
 
-                                December 27, 2023
+                                        February 27, 2024
 ```
 
 ### 与上一个版本相比新增功能
@@ -723,21 +734,71 @@ Python interpreter and run it!)
 #### New features compared to the previous version
 
 ```
+!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
+
+重写了PyPyNum的Zen。
+
+Rewrote the Zen of PyPyNum.
+
+!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
+
+“maths”模块的一些功能已经进行了优化，
+以实现更快的运行速度。
+
+Some functions of the "maths"
+module have been optimized to
+achieve faster running speed.
+
+!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
+
+修复了“tools”模块中的“split”函数导致
+的字符串分割错误。
+
+Fixed string splitting error
+caused by the "split" function
+in the "tools" module.
+
+!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
+
+“sequence”模块设置为每个序列返回单独
+的第n项或包含第0到第n项的列表的功能。
+
+The "sequence" module sets the
+function of returning a separate
+nth item or a list containing
+0th to nth items for each
+sequence.
+
+
+“geometric_sequence”函数补充了一个
+情况的求解函数，并且已经证实，其余两个情
+况没有解析解，需要使用多项式方程来求解。
+
+The "geometric_sequence"
+function supplements the solving
+function for one scenario, and
+it has been confirmed that there
+are no analytical solutions for
+the remaining two scenarios,
+which need to be solved using
+polynomial equations for
+implementation.
+
+!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
+
 <<<The "+" indicates the newly added method>>>
 
 maths [Mathematical functions]
     ...
-    cov(x: arr, y: arr) -> num +
-    corr_coeff(x: arr, y: arr) -> num +
-    coeff_det(x: arr, y: arr) -> num +
+    geom_mean(numbers: arr) -> num +
+    square_mean(numbers: arr) -> num +
+    harm_mean(numbers: arr) -> num +
     ...
 
 sequence [Various sequences]
     ...
-    arithmetic_sequence(*, a1=None, an=None, d=None, n=None, s=None) +
-    geometric_sequence(*, a1=None, an=None, r=None, n=None, s=None) +
-
-<<<There are three situations in the "geometric_sequence" function that have not been implemented>>>
+    recaman(n: int, single: bool = True) -> Union[int, list] +
+    ...
 ```
 
 ### 运行用时测试
@@ -978,6 +1039,9 @@ PyPyNum
             freq(data: arr) -> dict
             mode(data: arr)
             mean(numbers: arr) -> num
+            geom_mean(numbers: arr) -> num
+            square_mean(numbers: arr) -> num
+            harm_mean(numbers: arr) -> num
             var(numbers: arr) -> num
             std(numbers: arr) -> num
             cov(x: arr, y: arr) -> num
@@ -1030,11 +1094,12 @@ PyPyNum
             polynomial_regression(x: Union[list, tuple], y: Union[list, tuple], n: int = None) -> list
     ★ sequence [Various sequences]
         FUNCTIONS
-            fibonacci(n: int) -> int
-            catalan(n: int) -> int
+            fibonacci(n: int, single: bool = True) -> Union[int, list]
+            catalan(n: int, single: bool = True) -> Union[int, list]
             bernoulli(n: int, single: bool = True) -> list
-            arithmetic_sequence(*, a1=None, an=None, d=None, n=None, s=None)
-            geometric_sequence(*, a1=None, an=None, r=None, n=None, s=None)
+            recaman(n: int, single: bool = True) -> Union[int, list]
+            arithmetic_sequence(*, a1: real = None, an: real = None, d: real = None, n: real = None, s: real = None) -> dict
+            geometric_sequence(*, a1: real = None, an: real = None, r: real = None, n: real = None, s: real = None) -> dict
     ★ tools [Other useful tools]
         FUNCTIONS
             classify(array: Union[list, tuple]) -> dict

{PyPyNum-1.5.1 → PyPyNum-1.5.2}/pypynum/Matrix.py

@@ -168,10 +168,8 @@ class Matrix(Array):
             if len(item) == 2:
                 if isinstance(item[0], int) and isinstance(item[1], (int, slice)):
                     return self.data[item[0]][item[1]]
-                elif isinstance(item[0], slice) and isinstance(item[1], int):
-                    return self.t().data[item[1]][item[0]]
-                elif isinstance(item[0], slice) and isinstance(item[1], slice):
-                    return Matrix(Matrix(self.data[item[0]]).t().data[item[1]]).t()
+                elif isinstance(item[0], slice) and isinstance(item[1], (int, slice)):
+                    return [row[item[1]] for row in self.data[item[0]]]
                 else:
                     return []
             else:

{PyPyNum-1.5.1 → PyPyNum-1.5.2}/pypynum/README.md

@@ -14,10 +14,14 @@
           \|___|/                \|___|/
 ```
 
-## Version -> 1.5.1 | PyPI -> https://pypi.org/project/PyPyNum/ | Gitee -> https://www.gitee.com/PythonSJL/PyPyNum
+## Version -> 1.5.2 | PyPI -> https://pypi.org/project/PyPyNum/ | Gitee -> https://www.gitee.com/PythonSJL/PyPyNum
 
 ![LOGO](PyPyNum.png)
 
+PyPI上无法显示logo，可以在Gitee中查看。
+
+The logo cannot be displayed on PyPI, it can be viewed in Gitee.
+
 ### 介绍
 
 #### Introduction
@@ -29,20 +33,27 @@
 + 如需联系，QQ 2261748025 （Py𝙿𝚢𝚝𝚑𝚘𝚗-水晶兰）
 + If you need to contact, QQ 2261748025 (Py𝙿𝚢𝚝𝚑𝚘𝚗-水晶兰)
 
-### PyPyNum的Zen
+### PyPyNum的Zen（预览）
 
-#### The Zen of PyPyNum
+#### The Zen of PyPyNum (Preview)
 
 ```
     The Zen of PyPyNum, by Shen Jiayi
 
 This is a math package written purely in Python.
 
-... (Do you want to see the entire content?
-Then enter "from pypynum import this" on your
+Elegant is superior to clunky.
+Clarity trumps obscurity.
+Straightforwardness is preferred over convolution.
+Sophisticated is better than overcomplicated.
+Flat structure beats nested hierarchies.
+Sparse code wins over bloated ones.
+
+... (Do you want to view all the content?
+Enter "from pypynum import this" in your
 Python interpreter and run it!)
 
-                                December 27, 2023
+                                        February 27, 2024
 ```
 
 ### 与上一个版本相比新增功能
@@ -50,21 +61,71 @@ Python interpreter and run it!)
 #### New features compared to the previous version
 
 ```
+!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
+
+重写了PyPyNum的Zen。
+
+Rewrote the Zen of PyPyNum.
+
+!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
+
+“maths”模块的一些功能已经进行了优化，
+以实现更快的运行速度。
+
+Some functions of the "maths"
+module have been optimized to
+achieve faster running speed.
+
+!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
+
+修复了“tools”模块中的“split”函数导致
+的字符串分割错误。
+
+Fixed string splitting error
+caused by the "split" function
+in the "tools" module.
+
+!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
+
+“sequence”模块设置为每个序列返回单独
+的第n项或包含第0到第n项的列表的功能。
+
+The "sequence" module sets the
+function of returning a separate
+nth item or a list containing
+0th to nth items for each
+sequence.
+
+
+“geometric_sequence”函数补充了一个
+情况的求解函数，并且已经证实，其余两个情
+况没有解析解，需要使用多项式方程来求解。
+
+The "geometric_sequence"
+function supplements the solving
+function for one scenario, and
+it has been confirmed that there
+are no analytical solutions for
+the remaining two scenarios,
+which need to be solved using
+polynomial equations for
+implementation.
+
+!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
+
 <<<The "+" indicates the newly added method>>>
 
 maths [Mathematical functions]
     ...
-    cov(x: arr, y: arr) -> num +
-    corr_coeff(x: arr, y: arr) -> num +
-    coeff_det(x: arr, y: arr) -> num +
+    geom_mean(numbers: arr) -> num +
+    square_mean(numbers: arr) -> num +
+    harm_mean(numbers: arr) -> num +
     ...
 
 sequence [Various sequences]
     ...
-    arithmetic_sequence(*, a1=None, an=None, d=None, n=None, s=None) +
-    geometric_sequence(*, a1=None, an=None, r=None, n=None, s=None) +
-
-<<<There are three situations in the "geometric_sequence" function that have not been implemented>>>
+    recaman(n: int, single: bool = True) -> Union[int, list] +
+    ...
 ```
 
 ### 运行用时测试
@@ -305,6 +366,9 @@ PyPyNum
             freq(data: arr) -> dict
             mode(data: arr)
             mean(numbers: arr) -> num
+            geom_mean(numbers: arr) -> num
+            square_mean(numbers: arr) -> num
+            harm_mean(numbers: arr) -> num
             var(numbers: arr) -> num
             std(numbers: arr) -> num
             cov(x: arr, y: arr) -> num
@@ -357,11 +421,12 @@ PyPyNum
             polynomial_regression(x: Union[list, tuple], y: Union[list, tuple], n: int = None) -> list
     ★ sequence [Various sequences]
         FUNCTIONS
-            fibonacci(n: int) -> int
-            catalan(n: int) -> int
+            fibonacci(n: int, single: bool = True) -> Union[int, list]
+            catalan(n: int, single: bool = True) -> Union[int, list]
             bernoulli(n: int, single: bool = True) -> list
-            arithmetic_sequence(*, a1=None, an=None, d=None, n=None, s=None)
-            geometric_sequence(*, a1=None, an=None, r=None, n=None, s=None)
+            recaman(n: int, single: bool = True) -> Union[int, list]
+            arithmetic_sequence(*, a1: real = None, an: real = None, d: real = None, n: real = None, s: real = None) -> dict
+            geometric_sequence(*, a1: real = None, an: real = None, r: real = None, n: real = None, s: real = None) -> dict
     ★ tools [Other useful tools]
         FUNCTIONS
             classify(array: Union[list, tuple]) -> dict

{PyPyNum-1.5.1 → PyPyNum-1.5.2}/pypynum/__init__.py

@@ -33,7 +33,7 @@ from .tools import *
 from . import types
 from .Vector import vec
 
-__version__ = "1.5.1"
+__version__ = "1.5.2"
 print("PyPyNum", "Version -> " + __version__, "PyPI -> https://pypi.org/project/PyPyNum/",
       "Gitee -> https://www.gitee.com/PythonSJL/PyPyNum", sep=" | ")
 del math, arr, ite, num, real, geom, RandomError, LogicError, InputError, FullError, Union

{PyPyNum-1.5.1 → PyPyNum-1.5.2}/pypynum/maths.py

@@ -424,6 +424,57 @@ def mean(numbers: arr) -> num:
     return sum(numbers) / len(numbers)
 
 
+def geom_mean(numbers: arr) -> num:
+    """
+    introduction
+    ==========
+    The geometric mean of numbers
+
+    example
+    ==========
+    >>> geom_mean([1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
+    4.528728688116765
+    >>>
+    :param numbers: list | tuple
+    :return:
+    """
+    return root(product(numbers), len(numbers))
+
+
+def square_mean(numbers: arr) -> num:
+    """
+    introduction
+    ==========
+    Square mean of numbers
+
+    example
+    ==========
+    >>> square_mean([1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
+    6.2048368229954285
+    >>>
+    :param numbers: list | tuple
+    :return:
+    """
+    return (sum(map(lambda n: n * n, numbers)) / len(numbers)) ** 0.5
+
+
+def harm_mean(numbers: arr) -> num:
+    """
+    introduction
+    ==========
+    The harmonic mean of numbers
+
+    example
+    ==========
+    >>> harm_mean([1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
+    3.414171521474055
+    >>>
+    :param numbers: list | tuple
+    :return:
+    """
+    return 0 if 0 in numbers else len(numbers) / sum(map(lambda n: 1 / n, numbers))
+
+
 def var(numbers: arr) -> num:
     """
     introduction
@@ -537,10 +588,29 @@ def product(numbers: arr) -> num:
     :param numbers: list | tuple
     :return:
     """
-    result = 1
-    for _ in numbers:
-        result *= _
-    return result
+    if len(numbers) == 0:
+        return 1
+    elif 0 in numbers:
+        return 0
+    elif len(numbers) == 1:
+        return numbers[0]
+    elif len(numbers) <= 4096:
+        result = numbers[0]
+        for i in numbers[1:]:
+            result *= i
+        return result
+
+    def prod(n):
+        if len(n) == 1:
+            return n[0]
+        mid = len(n) // 2
+        left_half = n[:mid]
+        right_half = n[mid:]
+        left_product = prod(left_half)
+        right_product = prod(right_half)
+        return left_product * right_product
+
+    return prod(numbers)
 
 
 def sigma(i: int, n: int, f) -> num:
@@ -716,6 +786,8 @@ def combination(n: int, r: int) -> int:
     :param r: integer
     :return:
     """
+    if r > n >> 1:
+        return combination(n, n - r)
     return product(list(range(n, n - r, -1))) // product(list(range(r, 0, -1)))
 
 
@@ -728,13 +800,13 @@ def zeta(alpha: real) -> float:
 
     example
     ==========
-    >>> zeta(2)
-    1.6449339668472496
+    >>> zeta(3)
+    1.202056903150321
     >>>
     :param alpha: integer | float
     :return:
     """
-    return sum([1 / _ ** alpha for _ in range(1, 10000000)])
+    return sum(map(lambda _: _ ** (-alpha), range(1, 1000000)))
 
 
 def gaussian(x: real, _mu: real = 0, _sigma: real = 1) -> float:
@@ -909,7 +981,6 @@ def iroot(y: int, n: int) -> int:
     :param n: integer
     :return:
     """
-    from math import log as _log
     i = False
     if y < 0 and n & 1:
         y = abs(y)
@@ -921,7 +992,7 @@ def iroot(y: int, n: int) -> int:
     try:
         g = int(y ** (1 / n) + 0.5)
     except OverflowError:
-        e = _log(y, 2) / n
+        e = math.log(y, 2) / n
         if e > 53:
             s = int(e - 53)
             g = int(2 ** (e - s) + 1) << s

{PyPyNum-1.5.1 → PyPyNum-1.5.2}/pypynum/sequence.py

@@ -1,6 +1,16 @@
-def fibonacci(n: int) -> int:
+from .types import Union, real
+
+
+def fibonacci(n: int, single: bool = True) -> Union[int, list]:
     if isinstance(n, float):
         n = int(n)
+    if not single:
+        if n == 0:
+            return [0]
+        res = [0, 1]
+        for i in range(2, n + 1):
+            res.append(res[i - 1] + res[i - 2])
+        return res
 
     def mul(_a, _b):
         c = [[0, 0], [0, 0]]
@@ -22,12 +32,14 @@ def fibonacci(n: int) -> int:
     return res[0][1]
 
 
-def catalan(n: int) -> int:
+def catalan(n: int, single: bool = True) -> Union[int, list]:
     try:
         from math import comb
     except ImportError:
         from .maths import combination as comb
-    return comb(2 * n, n) // (n + 1)
+    if isinstance(n, float):
+        n = int(n)
+    return comb(2 * n, n) // (n + 1) if single else [comb(2 * x, x) // (x + 1) for x in range(n + 1)]
 
 
 def bernoulli(n: int, single: bool = True) -> list:
@@ -49,15 +61,31 @@ def bernoulli(n: int, single: bool = True) -> list:
     return [result[n].numerator, result[n].denominator] if single else [[n.numerator, n.denominator] for n in result]
 
 
-def arithmetic_sequence(*, a1=None, an=None, d=None, n=None, s=None):
+def recaman(n: int, single: bool = True) -> Union[int, list]:
+    if isinstance(n, float):
+        n = int(n)
+    seq = []
+    for i in range(n + 1):
+        if i == 0:
+            x = 0
+        else:
+            x = seq[i - 1] - i
+        if x >= 0 and x not in seq:
+            seq += [x]
+        else:
+            seq += [seq[i - 1] + i]
+    return seq[n] if single else seq
+
+
+def arithmetic_sequence(*, a1: real = None, an: real = None, d: real = None, n: real = None, s: real = None) -> dict:
     if [a1, an, d, n, s].count(None) != 2:
         raise ValueError("Must provide exactly three valid parameters")
 
     def solve_quadratic_equation(a, b, c):
         delta = b ** 2 - 4 * a * c
         if delta > 0:
-            x1 = (-b + (delta ** 0.5)) / (2 * a)
-            x2 = (-b - (delta ** 0.5)) / (2 * a)
+            x1 = (-b + delta ** 0.5) / (2 * a)
+            x2 = (-b - delta ** 0.5) / (2 * a)
             return [x1, x2]
         elif delta == 0:
             x = -b / (2 * a)
@@ -106,7 +134,7 @@ def arithmetic_sequence(*, a1=None, an=None, d=None, n=None, s=None):
     return {"a1": a1, "an": an, "d": d, "n": n, "s": s}
 
 
-def geometric_sequence(*, a1=None, an=None, r=None, n=None, s=None):
+def geometric_sequence(*, a1: real = None, an: real = None, r: real = None, n: real = None, s: real = None) -> dict:
     from math import log
     if [a1, an, r, n, s].count(None) != 2:
         raise ValueError("Must provide exactly three valid parameters")
@@ -134,8 +162,8 @@ def geometric_sequence(*, a1=None, an=None, r=None, n=None, s=None):
         a1 = an / r ** (n - 1)
         s = a1 * (r ** n - 1) / (r - 1) if r != 1 else a1 * n
     elif an is not None and r is not None and s is not None:
-        a1 = NotImplemented
-        n = NotImplemented
+        a1 = s * (1 - r) + an * r
+        n = log(an / a1, r) + 1
     elif an is not None and n is not None and s is not None:
         a1 = NotImplemented
         r = NotImplemented

PyPyNum-1.5.2/pypynum/this.py

@@ -0,0 +1,9 @@
+"""
+The Zen of PyPyNum
+"""
+
+Zen = "\x9a¤¢\xa0¢°¼§¢°éâñåâòõÖ°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°\x9a\x9a±äù°õóñâòýõ°ã·äõü½äàõóþÿó°äåÿôþñäã°ñ°ãù°þ÷ùãõô°âñüåôÿÝ\x9a¾÷þùãùýÿâà°õò°äø÷ùý°äù°¼ôâñçâÿöäø÷ùñâäã°ãù°þÿùäñäþõýõüàýù°õøä°öÙ\x9a¾äù°âõôùãþÿóõâ°¼ôþõøõâàýÿó°ÿä°÷þù÷þõüüñøó°ãù°þÿùäñäþõýõüàýù°õøä°öÙ\x9a¾÷þùøãåâ°ÿä°âÿùâõàåã°ãù°÷þùäùñç°ãõýùäõýÿã°¼âõæõçÿØ\x9a¾þÿùäñþùäãñâóÿâà°þñøä°âõääõò°ãù°éüäàýÿâà°÷þùäóÑ\x9a¾øóñÿâààñ°ãåÿùæòÿ½õþÿ°éüþÿ°õøä°¼éüüñõôù½õþÿ°õò°äãåý°õâõøÄ\x9a¾õäñüåóõàã°ÿä°õ÷âå°õøä°äãùãõâ°¼ããõþõå÷ñæ°öÿ°õóþõãõâà°õøä°þÙ\x9a¾ôõäåý°éüäùóùüàèõ°ããõüþÅ\x9a¾ôõóþõüùã°äÿþ°¼þõûÿàã°õò°äãåý°ãâÿââÕ\x9a¾éäùâåà°âõæÿ°ãøàýåùâä°þõäöÿ°éäùüñóùäóñâÀ\x9a¾ãýâÿþ°õøä°õôùââõæÿ°äÿþ°ôüåÿøã°ãõãñó°üñùóõàÃ\x9a¾äþåÿýñâñà°ãù°éäùüùòñôñõÂ\x9a¾ãõþÿ°ôõäñÿüò°âõæÿ°ãþùç°õôÿó°õãâñàÃ\x9a¾ãõùøóâñâõùø°ôõäãõþ°ãäñõò°õâåäóåâäã°äñüÖ\x9a¾ôõäñóùüàýÿóâõæÿ°þñøä°âõääõò°ãù°ôõäñóùäãùøàÿÃ\x9a¾þÿùäåüÿæþÿó°âõæÿ°ôõââõöõâà°ãù°ããõþôâñçâÿöäø÷ùñâäÃ\x9a¾éäùâåóãòÿ°ãàýåâä°éäùâñüÓ\x9a¾éûþåüó°ÿä°âÿùâõàåã°ãù°äþñ÷õüÕ\x9a\x9a¾þÿøäéÀ°þù°éüõâåà°þõääùâç°õ÷ñûóñà°øäñý°ñ°ãù°ãùøÄ\x9a\x9aùéñùÚ°þõøðéò°¼ýåÞéÀéÀ°öÿ°þõÊ°õøÄ°°°°\x9a"
+print("".join([chr(ord(_) ^ 144) for _ in Zen[::-1]]))
+for _ in list(globals().keys()):
+    del globals()[_]
+del _

{PyPyNum-1.5.1 → PyPyNum-1.5.2}/pypynum/tools.py

@@ -160,6 +160,7 @@ def split(iterable: ite, key: arr, retain: bool = False) -> list:
             if indexes:
                 index = min(indexes)
                 result.append(iterable[pointer:index])
+                pointer = index
                 if retain is True:
                     result.append(indexes[index])
                 pointer += len(indexes[index])
@@ -173,7 +174,7 @@ def split(iterable: ite, key: arr, retain: bool = False) -> list:
                 if isinstance(iterable, (list, tuple)):
                     pointer = item + 1
                 if retain is True:
-                    result.append(iterable[item])
+                    result.append([iterable[item]])
         result.append(iterable[pointer:])
     else:
         raise TypeError("Iterable can only be a list, tuple or str")

{PyPyNum-1.5.1 → PyPyNum-1.5.2}/setup.py

@@ -669,14 +669,14 @@ For more information on this, and how to apply and follow the GNU AGPL, see
 
 setup(
     name="PyPyNum",
-    version="1.5.1",
+    version="1.5.2",
     packages=find_packages(),
     url="https://www.gitee.com/PythonSJL/PyPyNum",
     license=LICENSE,
     author="Shen Jiayi",
     author_email="2261748025@qq.com",
     description="""
-    A Python math package written in pure Python programming language [python_requires >= 3.5]
+    A multifunctional mathematical calculation package written in pure Python programming language [Python>=3.5]
     """,
     python_requires=">=3.5",
     package_data={"pypynum": ["*"]},

PyPyNum-1.5.1/pypynum/this.py

@@ -1,9 +0,0 @@
-"""
-The Zen of PyPyNum
-"""
-
-Zen = 'rKJHJXTOJX\n\x1d\x1a\x15\x1d\x1b\x1d<XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXrrV\n\x19\x1d\x01X\x19X\x16\x11\x10\x0c\x11\x0fX\x14\x19\x17\x1fX\x0b\x11\x10\x0cX\x0b\x0b\x19\x08\n\r\x0bX\x16\x19\x1bX1rT\x10\x1f\r\x17\x16\x1dX\x0c\x0b\x19\x1eX\x0b\x11X\x1c\x1d\x1d\x08\x0bX\x1d\x0c\x19\x1c\x08\rX\x1d\x10\x0cX\x1e1rT\x0c\x1e\x1d\x14X\x0b\n\x19\x1d\x01X\x1e\x14\x19\x10X\x19X\x1c\x16\x19X\x1d\x16\x17X\x14\x14\x11\x0c\x0bX\x0b\x11X\x1d\n\x1d\x10,rrV\x14\x17\x17\x10\x1b\x0bX\x10\x1f\x11\x10X\x15\x17\n\x1eX\x1c\x1d\x0c\x19\r\x1c\x19\n\x1fX\x01\x1c\x19\x1d\n\x14\x19X\x1d\x0e\x19\x10X1X\x0b\x08\x19\x10\n\x1d(rT\x0b\x14\x19\x17\x1fX\x1f\x16\x11\x0e\x1d\x11\x10\x1b\x19X\x16\x1d\x10\x0fXT\x1d\x0b\n\r\x17\x1bX\x1e7rT\x1d\x1c\x17\x1bX\x1e\x17X\x0b\x1d\x16\x11\x14XHHHHIX\x1c\x1d\x1d\x1b\x00\x1dX\x17\x0cX\x0b\x15\x11\x19X\x1d\x1f\x19\x13\x1b\x19\x08X\x10\x0c\x19\x15X\x0b\x11\x10,rrV\x0c\x11X\x1d\x13\x11\x14X\x16\x19\x1bX\x1d\x16\x17\x01\n\x1d\x0e\x1dX\x1d\x08\x17\x10X1rT\x01(\x11\x1b+X\x1c\x16\x19X\x01(\x15\r6X\x0b\x19X\x10\x1b\r\x0bX\x0b\x1d\x1f\x19\x13\x1b\x19\x08r\x14\x19\x1b\x11\x0c\x19\x15\x1d\x10\x0c\x19\x15X\x1e\x17X\x16\x17\x11\x0c\n\x17\x08X\x14\x14\x19\x15\x0bX\x19X\x1d\x1b\x19\x14\x08\x1d\nX\x16\x19\x1bX\x0c1rT\x1d\x1f\x19\r\x1f\x16\x19\x14X;X\x1d\x0c\r\x1b\x1d\x00\x1dX\x0c\x17\x16\x16\x19\x1bX\x0b\n\x1d\x0c\x1d\n\x08\n\x1d\x0c\x16\x11X\x01(\x01(r\x0c\x19\x10\x0cX\x1d\x1f\x19\x0c\x16\x19\x0e\x1c\x19\x0b\x11\x1cX\x1d\x10\x0cX\n\x17\x1eX\x1d\x0c\x19\x0b\x16\x1d\x08\x15\x17\x1bX\x16\x19\x1bX\x0c\x11X\x0c\r:rT\x1d\x1f\x19\r\x1f\x16\x19\x14X;X\x0b\x19X\x0c\x0b\x19\x1eX\x0b\x19X\x0c\x17\x16X\x0b\x11X\x16\x17\x10\x0c\x01(X\x1d\n\r\x08X\x10\x1f\r\x17\x10\x0c\x149rrV\x1d\x16\x17\x14\x19X\x1d\x15X\x01\x1aX\x16\x1d\x0c\x0c\x11\n\x0fX\x1c\x1d\x1d\x1c\x16\x11X\x0b\x19\x0fX\x0c\x11XT\n\x1d\x0e\x1d\x0f\x170rrG\x0c\x16\x1d\x1c\r\x0c\x0br\x14\x17\x17\x10\x1b\x0bX\x10\x1f\x11\x10X\x19X\x01\x1aX\x16\x1d\x0c\x0c\x11\n\x0fX\x0b\x19\x0fX\x0b\x11\x10\x0cX\x1d\x0e\x1d\x11\x14\x1d\x1aX\r\x17\x01X\x17<rrV\x16\x17\x10\x0c\x01(X\x16\x11X\x01\x14\x1d\n\r\x08X\x16\x1d\x0c\x0c\x11\n\x0fX\x1d\x1f\x19\x13\x1b\x19\x08X\x10\x0c\x19\x15X\x19X\x0b\x11X\x0b\x11\x10,rr\x11\x01\x19\x112X\x16\x1d\x10+X\x01\x1aXT\x15\r6\x01(\x01(X\x1e\x17X\x16\x1d"X\x1d\x10,XXXXr'
-print("".join([chr(ord(_) ^ 120) for _ in Zen[::-1]]))
-for _ in list(globals().keys()):
-    del globals()[_]
-del _