PyPyNum 1.5.0__tar.gz → 1.5.2__tar.gz

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

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: PyPyNum
-Version: 1.5.0
-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
@@ -673,8 +673,8 @@ Description-Content-Type: text/markdown
 
 # <font color = blue>PyPyNum</font>
 
-<font color = gree>A Python math package written in pure Python programming language</font> <font color = red>(
-python_requires >= 3.5)</font>
+<font color = gree>A Python math package written in pure Python programming language</font><font color = red>
+(python_requires >= 3.5)</font>
 
 ```
  ________   ___    ___  ________   ___    ___  ________    ___  ___   _____ ______
@@ -687,10 +687,14 @@ python_requires >= 3.5)</font>
           \|___|/                \|___|/
 ```
 
-## Version -> 1.5.0 | 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 @@ python_requires >= 3.5)</font>
 + 如需联系，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
 ```
 
 ### 与上一个版本相比新增功能
@@ -725,88 +736,69 @@ Python interpreter and run it!)
 ```
 !=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
 
-“Symbolics”模块中的希腊字母字符串中存
-在错误，已更正
-There is an error in the Greek
-letter string in the "Symbolics"
-module, which has been corrected
+重写了PyPyNum的Zen。
+
+Rewrote the Zen of PyPyNum.
+
+!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
+
+“maths”模块的一些功能已经进行了优化，
+以实现更快的运行速度。
+
+Some functions of the "maths"
+module have been optimized to
+achieve faster running speed.
 
 !=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
 
-傅立叶变换的类“FT1D”在数据末尾设置自动
-零填充，直到数据长度达到2的正整数幂
-The class "FT1D" of Fourier
-transform sets automatic zero
-padding at the end of the data
-until the data length reaches a
-positive integer power of 2
+修复了“tools”模块中的“split”函数导致
+的字符串分割错误。
+
+Fixed string splitting error
+caused by the "split" function
+in the "tools" module.
 
 !=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
 
-“plotting”模块中添加了一个非常有用的
-“color”函数，可用于使字符串或其他类型
-的数据着色。
-A very useful "color" function
-has been added to the "plotting"
-module, which can be used to
-make strings or other types of
-data colored.
-
-您可以使用此函数为字符上色，然后将其用作
-绘制函数曲线的字符，并将“coloration”
-参数设置为“True”（可能仅适用于
-PyCharm等编程软件）
-You can use this function to
-color a character, then use it
-as the character to draw the
-function curve, and set the
-"color" parameter to "True"
-(which may only be applicable to
-programming software like
-PyCharm)
+“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>
-
-[This is the base class of vectors, matrices, and tensors]
-
-Array(data=None, check=True)
-    __add__(self, other)
-    __eq__(self, other)
-    __getitem__(self, item)
-    __hash__(self)
-    __init__(self, data=None, check=True)
-    __ne__(self, other)
-    __radd__(self, other)
-    __repr__(self)
-    __round__(self, n=None)
-    __str__(self)
-    argmax(self, axis=None) +
-    argmin(self, axis=None) +
-    basic(self, func, axis=None) +
-    copy(self)
-    flatten(self)
-    max(self, axis=None) +
-    mean(self, axis=None) +
-    median(self, axis=None) +
-    min(self, axis=None) +
-    mode(self, axis=None) +
-    product(self, axis=None) +
-    ptp(self, axis=None) +
-    reshape(self, shape)
-    std(self, axis=None) +
-    sum(self, axis=None) +
-    var(self, axis=None) +
+<<<The "+" indicates the newly added method>>>
 
 maths [Mathematical functions]
-    root(x: num, y: num) -> num +
     ...
-    cumsum(lst: arr) -> list +
-    cumprod(lst: arr) -> list +
-    iroot(y: int, n: int) -> int +
+    geom_mean(numbers: arr) -> num +
+    square_mean(numbers: arr) -> num +
+    harm_mean(numbers: arr) -> num +
+    ...
 
-<<< Other modules also have certain modifications >>>
+sequence [Various sequences]
+    ...
+    recaman(n: int, single: bool = True) -> Union[int, list] +
+    ...
 ```
 
 ### 运行用时测试
@@ -1047,8 +1039,14 @@ 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
+            corr_coeff(x: arr, y: arr) -> num
+            coeff_det(x: arr, y: arr) -> num
             product(numbers: arr) -> num
             sigma(i: int, n: int, f) -> num
             pi(i: int, n: int, f) -> num
@@ -1096,9 +1094,12 @@ PyPyNum
             polynomial_regression(x: Union[list, tuple], y: Union[list, tuple], n: int = None) -> list
     ★ sequence [Various sequences]
         FUNCTIONS
+            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
-            catalan(n: int) -> int
-            fibonacci(n: int) -> int
+            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.0 → PyPyNum-1.5.2}/PyPyNum.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: PyPyNum
-Version: 1.5.0
-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
@@ -673,8 +673,8 @@ Description-Content-Type: text/markdown
 
 # <font color = blue>PyPyNum</font>
 
-<font color = gree>A Python math package written in pure Python programming language</font> <font color = red>(
-python_requires >= 3.5)</font>
+<font color = gree>A Python math package written in pure Python programming language</font><font color = red>
+(python_requires >= 3.5)</font>
 
 ```
  ________   ___    ___  ________   ___    ___  ________    ___  ___   _____ ______
@@ -687,10 +687,14 @@ python_requires >= 3.5)</font>
           \|___|/                \|___|/
 ```
 
-## Version -> 1.5.0 | 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 @@ python_requires >= 3.5)</font>
 + 如需联系，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
 ```
 
 ### 与上一个版本相比新增功能
@@ -725,88 +736,69 @@ Python interpreter and run it!)
 ```
 !=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
 
-“Symbolics”模块中的希腊字母字符串中存
-在错误，已更正
-There is an error in the Greek
-letter string in the "Symbolics"
-module, which has been corrected
+重写了PyPyNum的Zen。
+
+Rewrote the Zen of PyPyNum.
+
+!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
+
+“maths”模块的一些功能已经进行了优化，
+以实现更快的运行速度。
+
+Some functions of the "maths"
+module have been optimized to
+achieve faster running speed.
 
 !=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
 
-傅立叶变换的类“FT1D”在数据末尾设置自动
-零填充，直到数据长度达到2的正整数幂
-The class "FT1D" of Fourier
-transform sets automatic zero
-padding at the end of the data
-until the data length reaches a
-positive integer power of 2
+修复了“tools”模块中的“split”函数导致
+的字符串分割错误。
+
+Fixed string splitting error
+caused by the "split" function
+in the "tools" module.
 
 !=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
 
-“plotting”模块中添加了一个非常有用的
-“color”函数，可用于使字符串或其他类型
-的数据着色。
-A very useful "color" function
-has been added to the "plotting"
-module, which can be used to
-make strings or other types of
-data colored.
-
-您可以使用此函数为字符上色，然后将其用作
-绘制函数曲线的字符，并将“coloration”
-参数设置为“True”（可能仅适用于
-PyCharm等编程软件）
-You can use this function to
-color a character, then use it
-as the character to draw the
-function curve, and set the
-"color" parameter to "True"
-(which may only be applicable to
-programming software like
-PyCharm)
+“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>
-
-[This is the base class of vectors, matrices, and tensors]
-
-Array(data=None, check=True)
-    __add__(self, other)
-    __eq__(self, other)
-    __getitem__(self, item)
-    __hash__(self)
-    __init__(self, data=None, check=True)
-    __ne__(self, other)
-    __radd__(self, other)
-    __repr__(self)
-    __round__(self, n=None)
-    __str__(self)
-    argmax(self, axis=None) +
-    argmin(self, axis=None) +
-    basic(self, func, axis=None) +
-    copy(self)
-    flatten(self)
-    max(self, axis=None) +
-    mean(self, axis=None) +
-    median(self, axis=None) +
-    min(self, axis=None) +
-    mode(self, axis=None) +
-    product(self, axis=None) +
-    ptp(self, axis=None) +
-    reshape(self, shape)
-    std(self, axis=None) +
-    sum(self, axis=None) +
-    var(self, axis=None) +
+<<<The "+" indicates the newly added method>>>
 
 maths [Mathematical functions]
-    root(x: num, y: num) -> num +
     ...
-    cumsum(lst: arr) -> list +
-    cumprod(lst: arr) -> list +
-    iroot(y: int, n: int) -> int +
+    geom_mean(numbers: arr) -> num +
+    square_mean(numbers: arr) -> num +
+    harm_mean(numbers: arr) -> num +
+    ...
 
-<<< Other modules also have certain modifications >>>
+sequence [Various sequences]
+    ...
+    recaman(n: int, single: bool = True) -> Union[int, list] +
+    ...
 ```
 
 ### 运行用时测试
@@ -1047,8 +1039,14 @@ 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
+            corr_coeff(x: arr, y: arr) -> num
+            coeff_det(x: arr, y: arr) -> num
             product(numbers: arr) -> num
             sigma(i: int, n: int, f) -> num
             pi(i: int, n: int, f) -> num
@@ -1096,9 +1094,12 @@ PyPyNum
             polynomial_regression(x: Union[list, tuple], y: Union[list, tuple], n: int = None) -> list
     ★ sequence [Various sequences]
         FUNCTIONS
+            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
-            catalan(n: int) -> int
-            fibonacci(n: int) -> int
+            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.0 → 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: