PyPyNum 1.7.0__py3-none-any.whl → 1.8.0__py3-none-any.whl

{PyPyNum-1.7.0.dist-info → PyPyNum-1.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPyNum
-Version: 1.7.0
+Version: 1.8.0
 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
@@ -668,6 +668,7 @@ License:
         For more information on this, and how to apply and follow the GNU AGPL, see
         <http://www.gnu.org/licenses/>.
         
+Keywords: math,数学,mathematics,数学计算,numerical,数值,computation,计算,scientific,科学,algebra,代数,calculus,微积分,statistics,统计,linear-algebra,线性代数,optimization,优化,numerical-analysis,数值分析,matrix,矩阵,vector,向量,tensor,张量,numerics,数值计算,library,库,tools,工具,utils,实用程序,algorithms,算法,software,软件,package,包,methods,方法,data-science,数据科学,machine-learning,机器学习,computational,计算的,operations,操作,functions,函数,processing,处理,programming,编程,simulation,仿真,visualization,可视化,physics,物理
 Requires-Python: >=3.5
 Description-Content-Type: text/markdown
 
@@ -691,7 +692,7 @@ Description-Content-Type: text/markdown
 [![Downloads](https://static.pepy.tech/badge/pypynum/month)](https://pepy.tech/project/pypynum)
 [![Downloads](https://static.pepy.tech/badge/pypynum/week)](https://pepy.tech/project/pypynum)
 
-## Version -> 1.7.0 | PyPI -> https://pypi.org/project/PyPyNum/ | Gitee -> https://www.gitee.com/PythonSJL/PyPyNum
+## Version -> 1.8.0 | PyPI -> https://pypi.org/project/PyPyNum/ | Gitee -> https://www.gitee.com/PythonSJL/PyPyNum
 
 ![LOGO](PyPyNum.png)
 
@@ -740,54 +741,65 @@ Python interpreter and run it!)
 ```
 !=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
 
-新增代码行数：
-约八百行
+新增代码行数为603行
 
-New code lines:
-approximately 800 lines
+Add 603 new lines of code
 
 !=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
 
-部分函数再次优化，性能提高一倍。
+新增函数“magic_square”的功能简介：可
+以生成任意大于等于三的整数阶幻方。
 
-Partial functions were optimized
-again, resulting in a doubling
-of performance.
+Introduction to the newly added
+function "magic square": It can
+generate any integer order magic
+square greater than or equal to
+three.
 
 !=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
 
-新增的好玩功能举例。
-
-Examples of newly added fun
-features.
-
-新增的有序集合包含绝大多数内置集合的运算
-，并且另有几个新函数。请注意它不是从内置
-集合继承的。
-
-The newly added ordered set
-contains the majority of
-built-in set operations, and
-there are also several new
-functions. Please note that it
-does not inherit from the
-built-in set.
-
-新增的无穷迭代器支持迭代多种数列，默认的
-空字符串即为自增数列。目前支持的数列有等
-差数列、等比数列、斐波那契数列与卡特兰数
-列。
-
-The newly added infinite
-iterator supports iterating
-multiple sequences, and the
-default empty string is the self
-increasing sequence. The
-currently supported sequences
-include arithmetic sequences,
-proportional sequences,
-Fibonacci sequences, and Catalan
-sequences.
+新增模块“Graph”的功能简介：具有有向图
+、无向图、带权有向图、带权无向图这四个对
+象，支持添加或删除顶点和边，以及深度优先
+搜索与广度优先搜索这两种图的遍历方式，还
+有计算最短路径等功能。
+
+Introduction to the functions of
+the newly added module "Graph":
+it has four objects: directed
+graph, undirected graph,
+weighted directed graph, and
+weighted undirected graph. It
+supports adding or removing
+vertices and edges, as well as
+depth first search and breadth
+first search for graph
+traversal. It also has functions
+such as calculating the shortest
+path.
+
+!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
+
+新增模块“polynomial”的功能简介：有一
+个多项式对象，可以通过传入包含“(次数,
+系数)”的二元组组成的序列创建多项式对象
+，可以随时设置某一项的数值，并且支持多
+项式形式的四则运算，还有取商式、取余式
+、求幂、求模幂的功能。
+
+Introduction to the newly added
+module "polynomial": There is a
+polynomial object that can be
+created by passing in a sequence
+of binary tuples containing
+"degree, coefficient". The value
+of a certain term can be set at
+any time, and it supports
+polynomial form arithmetic
+operations. It also has
+functions such as quotient,
+remainder, exponentiation, and
+modular exponentiation.
 
 !=!=!=!=!=!=!=!=!=!=!=!=!=!=!=!=
 
@@ -796,34 +808,23 @@ sequences.
 <<<The ellipsis in the following structure represents the original part>>>
 
 PyPyNum
-    ★ Tree [Various trees]
+    ★ Graph [Graph theory]
         CLASSES
-            MultiTree
-            MultiTreeNode
-    ★ maths [Mathematical functions]
-        FUNCTIONS
-            ...
-            totient(n: int) -> int
-            mod_order(a: int, n: int, b: int) -> int
-            primitive_root(a: int, single: bool = False) -> Union[int, list]
-            normalize(data: arr, target: num = 1) -> arr
-            average(data, weights, expected=False)
-            exgcd(a: int, b: int) -> tuple
-            crt(n: arr, a: arr) -> int
-    ★ sequence [Various sequences]
+            BaseGraph
+                BaseWeGraph
+                    WeDiGraph
+                    WeUnGraph
+                DiGraph
+                UnGraph
+    ★ polynomial [Polynomial object]
+        CLASSES
+            Polynomial
         FUNCTIONS
-            farey(n: int) -> list
-            ...
+            poly(terms=None)
     ★ tools [Other useful tools]
         FUNCTIONS
             ...
-            primality(n: int, iter_num: int = 10) -> bool
-            generate_primes(limit: int) -> list
-            prime_factors(integer: int, dictionary: bool = False, pollard_rho: bool = True) -> Union[list, dict]
-    ★ utils [Other useful tools]
-        CLASSES
-            InfIterator
-            OrderedSet
+            magic_square(n)
 ```
 
 ### 运行用时测试
@@ -893,6 +894,14 @@ PyPyNum
             Triangle
         FUNCTIONS
             distance(g1, g2, error: int | float = 0) -> float
+    ★ Graph [Graph theory]
+        CLASSES
+            BaseGraph
+                BaseWeGraph
+                    WeDiGraph
+                    WeUnGraph
+                DiGraph
+                UnGraph
     ★ Group [Group theory]
         CLASSES
             Group
@@ -1138,6 +1147,11 @@ PyPyNum
             unary(function, right: real = 5, left: real = -5, top: real = 5, bottom: real = -5, complexity: real = 5...
             binary(function, right: real = 5, left: real = -5, top: real = 5, bottom: real = -5, complexity: real = 5...
             c_unary(function, start: real, end: real, interval: real = 5, projection: str = "ri", right: real = 5...
+    ★ polynomial [Polynomial object]
+        CLASSES
+            Polynomial
+        FUNCTIONS
+            poly(terms=None)
     ★ probability [Probability function]
         FUNCTIONS
             binomial(sample_size: int, successes: int, success_probability: Union[int, float]) -> float
@@ -1176,6 +1190,7 @@ PyPyNum
             primality(n: int, iter_num: int = 10) -> bool
             generate_primes(limit: int) -> list
             prime_factors(integer: int, dictionary: bool = False, pollard_rho: bool = True) -> Union[list, dict]
+            magic_square(n)
     ★ utils [Other useful tools]
         CLASSES
             InfIterator

{PyPyNum-1.7.0.dist-info → PyPyNum-1.8.0.dist-info}/RECORD

@@ -1,16 +1,19 @@
 pypynum/Array.py,sha256=MLGvkYC9V7fGAR3g1Xykt_-hJYDC8mE47ji8dBcqFhk,6632
 pypynum/FourierT.py,sha256=AtG0tESykzEs4gDsXhcizW7qhQnmw0gjcWcXefBqzhs,1401
 pypynum/Geometry.py,sha256=bJCuif-wHO-t7oHFEE7ntzIdQwzUEbT3mcKgmBV6Wps,13982
+pypynum/Graph.py,sha256=m9iTCNYRCZmAexDzwJ8Y6J7v1aweT-6TZkqh4fOtZDE,10131
 pypynum/Group.py,sha256=m39OZNRoG9b3p_7sS1u50A0rJl0aYqYPVvnttkYQ_gw,2944
 pypynum/Logic.py,sha256=IJAv59ECHU0HmG9lYCAQ_puqeL6Zor3-IDIVH48KBWE,11000
 pypynum/Matrix.py,sha256=Z2k0bl_VpnaWB3QZjokR9CR7-kDaYIKUjKITWTYGa98,11024
 pypynum/NeuralN.py,sha256=iSOvC9JW1h4AFGokGGOTkKie5hAYN_YT9H4f3apI9b8,3275
+pypynum/PyPyNum.png,sha256=t96tJPWfHxT8kcXm_qZI2z5W36TgOqjCU9qdgbmlFws,11623
 pypynum/Quaternion.py,sha256=E7ajc4sDJyOuQQIwKPhUEHgiaeeR5BEzFZHhJMxvbok,8007
+pypynum/README.md,sha256=fiCTdsbI9rza9ZogDQ2jwxHhTFXD7dR6vfAbBTkYUP4,43971
 pypynum/Symbolics.py,sha256=Nfo0DEch7LII53ye1wZAdIfd3IAOKbECnZQMSk_cmCs,2898
 pypynum/Tensor.py,sha256=SJzGRNwHZzOgEabt47scccb-plA25-6s01SFyHd6lJo,3801
-pypynum/Tree.py,sha256=7zqhVRdDu9u5lBQLM99AmfwIe0mgkfofj-VcHGguQGc,2816
+pypynum/Tree.py,sha256=MUT9LErZ3ER_cbiga-nOaZC7Hln8jEV8tRca2dRPWmY,2827
 pypynum/Vector.py,sha256=eiFCY6H35pMvvDX7NpLux_bSfLI8rK8JHkaRxv7pOW8,3552
-pypynum/__init__.py,sha256=X6ENdfAc5xxaFMNRMbT2JAx4VCPEa6W4nLkDdNASUsM,1782
+pypynum/__init__.py,sha256=akxx-NuZTFE9fnNW9u6KUo3KyA-vU8iU_m70FQmfzb0,1831
 pypynum/__temporary.py,sha256=OAs7it7xjDovgAmKLcj-9Pqp0228SSon3OZx0ih_h4I,5860
 pypynum/chars.py,sha256=VcK9w0i73FMCzc-9aIibjdHqyMsofJXdoBq0d8L7Vr0,1001
 pypynum/cipher.py,sha256=J5PZl8Xt71LuX29eSBu4cybNK6Z3rhA9og_YzD0YJfU,1002
@@ -18,19 +21,20 @@ pypynum/constants.py,sha256=s2P1K8HH2nqoA6_YOVf6TKRl1Ozjf79GmCmLN9YbWxI,843
 pypynum/equations.py,sha256=_4xIXr7A56qBXKzJXyb91L4h09H7TDVNrcufy-XxkaI,744
 pypynum/errors.py,sha256=11-Au4aV8H5ExaDuMtu5iuGvpRaJP8gW7XbGNRmefSI,173
 pypynum/file.py,sha256=rqrPdcX0NOEPM8s40-ymgPKsTn0HKABW-VEh1OtPnsk,3188
-pypynum/maths.py,sha256=GgEbFMGKim6ZwPwrFpwIIfhD5rDHsprIbR7mijoTWvc,24753
+pypynum/maths.py,sha256=53TDBkZkHh1FZIQFfhi-_YwXvTSf630G-ooDS1Z7PFc,26518
 pypynum/numbers.py,sha256=WOxwwAN3yHakN4eHcVNn35qsfDcgw3UPSblv4woWyDE,6028
 pypynum/plotting.py,sha256=YQg9sO_nuLSaAKQuSpebWVvbu-ns2A7JOrHch6r0FQ0,8326
+pypynum/polynomial.py,sha256=psFukA31Ed4U7hZHcCGWCpYMi8tanTsZl-pUdklikfg,5998
 pypynum/probability.py,sha256=kZLCfZb2q_y1CVbozSZj9xQ8Dw3il5WcAojX0jsNyXw,2130
 pypynum/random.py,sha256=vfTtyH5yOSKJoSI_-NT_Tg8wC-ZXT0wt34f87oaSpJY,4610
 pypynum/regression.py,sha256=D9J9lM23HiyY4eE8vHKaHoiwuvD1RYhkVNO0jQ4yml4,2118
 pypynum/sequence.py,sha256=7NSZm_p_B00KFj5XZrtSm2FXhsowxs0qg_Q_P4pAA8o,7194
 pypynum/test.py,sha256=Bksa7HZaywKBbLaCw2R5kGRFj6eKzkkJ7BdJBgIB3uM,8428
 pypynum/this.py,sha256=8Swp75xE5g6436NCVDfYUVwUzUcQFPLcCNFWQWY5eGQ,2129
-pypynum/tools.py,sha256=Ki33faUpijydG1AKqh3R6qmU4EFky_35p-ZsdUZPxJM,9823
+pypynum/tools.py,sha256=jqmzsRi2INRlnI4hb4IbpMKHlvEww3ZKO9y6DxrJUbA,12697
 pypynum/types.py,sha256=CVWPZo_ACr_QGH5gAOhoG3jK35peiqipu3PH8ScEYHE,181
 pypynum/utils.py,sha256=V1k-JFHLr_VGUVqwOeAVH9Ju7AHQVEoVgYA7M-dPsLw,9881
-PyPyNum-1.7.0.dist-info/METADATA,sha256=ji2R_OijTBE2tNPK1GN5EVoTo4H6VNrbewnoVwtUCik,84411
-PyPyNum-1.7.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-PyPyNum-1.7.0.dist-info/top_level.txt,sha256=4wW_Xb4bRglmiMsdPAe9f75MkXhNpuN88H17g_Cr5u8,8
-PyPyNum-1.7.0.dist-info/RECORD,,
+PyPyNum-1.8.0.dist-info/METADATA,sha256=sKDkUYxVw125A9ZsbFD_AigRGifQOSUMR0jrIgKkIh8,85418
+PyPyNum-1.8.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+PyPyNum-1.8.0.dist-info/top_level.txt,sha256=4wW_Xb4bRglmiMsdPAe9f75MkXhNpuN88H17g_Cr5u8,8
+PyPyNum-1.8.0.dist-info/RECORD,,

pypynum/Graph.py

@@ -0,0 +1,270 @@
+class BaseGraph:
+    def __init__(self):
+        self.graph = {}
+
+    def __repr__(self):
+        return "{}({})".format(self.__class__.__name__, sorted(self.graph.items()))
+
+    def add_vertex(self, vertex):
+        if vertex not in self.graph:
+            self.graph[vertex] = []
+
+    def remove_vertex(self, vertex):
+        if vertex in self.graph:
+            neighbors = self.graph[vertex]
+            del self.graph[vertex]
+            for neighbor in neighbors:
+                self.graph[neighbor].remove(vertex)
+
+    def has_vertex(self, vertex):
+        return vertex in self.graph
+
+    def has_edge(self, vertex1, vertex2):
+        return vertex1 in self.graph and vertex2 in self.graph[vertex1]
+
+    def get_edges(self, vertex):
+        return self.graph.get(vertex, {})
+
+    def all_vertices(self):
+        return sorted(set(list(self.graph) + sum([list(self.graph[vertex]) for vertex in self.graph], [])))
+
+    def all_edges(self):
+        edges = []
+        for vertex, neighbours in self.graph.items():
+            for neighbour in neighbours:
+                edges.append((vertex, neighbour))
+        return sorted(edges)
+
+    def to_adjacency_matrix(self):
+        vertices = self.all_vertices()
+        num_vertices = len(vertices)
+        matrix = [[0] * num_vertices for _ in range(num_vertices)]
+        if isinstance(self, BaseWeGraph):
+            for u in self.graph:
+                for v in self.graph[u].items():
+                    try:
+                        v, w = v
+                        matrix_index_u = vertices.index(u)
+                        matrix_index_v = vertices.index(v)
+                        matrix[matrix_index_u][matrix_index_v] = w
+                    except ValueError:
+                        continue
+        else:
+            for u in self.graph:
+                for v in self.graph[u]:
+                    try:
+                        matrix_index_u = vertices.index(u)
+                        matrix_index_v = vertices.index(v)
+                        matrix[matrix_index_u][matrix_index_v] = 1
+                    except ValueError:
+                        continue
+        return [[self.__class__.__name__] + vertices] + [[vertex] + row for vertex, row in zip(vertices, matrix)]
+
+    def dfs(self, start_vertex, visited=None):
+        if visited is None:
+            visited = set()
+        visited.add(start_vertex)
+        search_list = [start_vertex]
+        if start_vertex not in self.graph:
+            return [start_vertex]
+        for neighbour in self.graph[start_vertex]:
+            if neighbour not in visited:
+                search_list.extend(self.dfs(neighbour, visited))
+        return search_list
+
+    def bfs(self, start_vertex):
+        visited = {start_vertex}
+        queue = [start_vertex]
+        search_list = [start_vertex]
+        while queue:
+            vertex = queue.pop(0)
+            if vertex in self.graph:
+                for neighbour in self.graph[vertex]:
+                    if neighbour not in visited:
+                        visited.add(neighbour)
+                        queue.append(neighbour)
+                        search_list.append(neighbour)
+        return search_list
+
+    def is_connected(self):
+        visited = set()
+        queue = []
+        for node in self.graph:
+            if node not in visited:
+                visited.add(node)
+                queue.append(node)
+                break
+        while queue:
+            node = queue.pop(0)
+            for neighbor in self.graph[node]:
+                if neighbor not in visited:
+                    visited.add(neighbor)
+                    queue.append(neighbor)
+        return len(visited) == len(self.graph)
+
+    def is_complete(self):
+        num_nodes = len(self.graph)
+        return all([len(self.graph[node]) == num_nodes - 1 for node in self.graph])
+
+
+class DiGraph(BaseGraph):
+    def add_edge(self, vertex1, vertex2):
+        if vertex1 in self.graph:
+            self.graph[vertex1].append(vertex2)
+        else:
+            self.graph[vertex1] = [vertex2]
+
+    def remove_edge(self, vertex1, vertex2):
+        if vertex1 in self.graph and vertex2 in self.graph[vertex1]:
+            self.graph[vertex1].remove(vertex2)
+            if not self.graph[vertex1]:
+                del self.graph[vertex1]
+
+    def __str__(self):
+        edges = []
+        for vertex, neighbours in self.graph.items():
+            for neighbour in neighbours:
+                edges.append("{} -> {}".format(vertex, neighbour))
+        return "\n".join(sorted(edges))
+
+
+class UnGraph(BaseGraph):
+    def add_edge(self, vertex1, vertex2):
+        if vertex1 in self.graph:
+            self.graph[vertex1].append(vertex2)
+        else:
+            self.graph[vertex1] = [vertex2]
+        if vertex2 in self.graph:
+            self.graph[vertex2].append(vertex1)
+        else:
+            self.graph[vertex2] = [vertex1]
+
+    def remove_edge(self, vertex1, vertex2):
+        if vertex1 in self.graph and vertex2 in self.graph:
+            if vertex2 in self.graph[vertex1]:
+                self.graph[vertex1].remove(vertex2)
+            if vertex1 in self.graph[vertex2]:
+                self.graph[vertex2].remove(vertex1)
+            if not self.graph[vertex1]:
+                del self.graph[vertex1]
+            if not self.graph[vertex2]:
+                del self.graph[vertex2]
+
+    def __str__(self):
+        edges = []
+        for vertex, neighbours in self.graph.items():
+            for neighbour in neighbours:
+                edges.append("{} -- {}".format(vertex, neighbour))
+        return "\n".join(sorted(edges))
+
+
+class BaseWeGraph(BaseGraph):
+    def add_edge(self, vertex1, vertex2, weight=0):
+        raise NotImplementedError
+
+    def remove_edge(self, vertex1, vertex2):
+        raise NotImplementedError
+
+    def add_vertex(self, vertex):
+        if vertex not in self.graph:
+            self.graph[vertex] = {}
+
+    def remove_vertex(self, vertex):
+        if vertex in self.graph:
+            neighbors = self.graph[vertex]
+            del self.graph[vertex]
+            for neighbor in neighbors:
+                self.remove_edge(neighbor, vertex)
+
+    def get_edge_weight(self, vertex1, vertex2):
+        if self.has_edge(vertex1, vertex2):
+            return self.graph[vertex1][vertex2]
+
+    def get_in_degree_weight_sum(self, vertex):
+        return sum([self.get_edge_weight(neighbor, vertex)
+                    for neighbor in self.graph if vertex in self.graph[neighbor]])
+
+    def get_out_degree_weight_sum(self, vertex):
+        return sum([self.get_edge_weight(vertex, neighbor) for neighbor in self.graph.get(vertex, {})])
+
+    def dijkstra(self, start):
+        distances = {vertex: float("inf") for vertex in self.graph}
+        distances[start] = 0
+        queue = [(0, start)]
+        visited = set()
+        while queue:
+            current_distance, current_vertex = min(queue, key=lambda x: x[0])
+            if current_vertex in visited:
+                queue.remove((current_distance, current_vertex))
+                continue
+            visited.add(current_vertex)
+            queue.remove((current_distance, current_vertex))
+            if current_distance > distances[current_vertex] or current_vertex not in self.graph:
+                continue
+            for neighbor, weight in self.graph[current_vertex].items():
+                distance = current_distance + weight
+                if neighbor in distances:
+                    if distance < distances[neighbor]:
+                        distances[neighbor] = distance
+                        queue.append((distance, neighbor))
+                else:
+                    distances[neighbor] = distance
+                    queue.append((distance, neighbor))
+        return distances
+
+    def reconstruct_path(self, start, end, distances):
+        current = end
+        path = [current]
+        while current != start:
+            for neighbor, weight in self.get_edges(current).items():
+                if distances[current] == distances[neighbor] + weight:
+                    current = neighbor
+                    path.append(current)
+                    break
+        return path[::-1]
+
+
+class WeDiGraph(BaseWeGraph):
+    def add_edge(self, vertex1, vertex2, weight=0):
+        if vertex1 not in self.graph:
+            self.graph[vertex1] = {}
+        self.graph[vertex1][vertex2] = weight
+
+    def remove_edge(self, vertex1, vertex2):
+        if vertex1 in self.graph and vertex2 in self.graph[vertex1]:
+            del self.graph[vertex1][vertex2]
+            if not self.graph[vertex1]:
+                del self.graph[vertex1]
+
+    def __str__(self):
+        edges = []
+        for vertex, neighbours in self.graph.items():
+            for neighbour, weight in neighbours.items():
+                edges.append("{} -[{}]> {}".format(vertex, weight, neighbour))
+        return "\n".join(sorted(edges))
+
+
+class WeUnGraph(BaseWeGraph):
+    def add_edge(self, vertex1, vertex2, weight=0):
+        if vertex1 not in self.graph:
+            self.graph[vertex1] = {}
+        if vertex2 not in self.graph:
+            self.graph[vertex2] = {}
+        self.graph[vertex1][vertex2] = weight
+        self.graph[vertex2][vertex1] = weight
+
+    def remove_edge(self, vertex1, vertex2):
+        if vertex1 in self.graph and vertex2 in self.graph[vertex1]:
+            del self.graph[vertex1][vertex2]
+            del self.graph[vertex2][vertex1]
+            if not self.graph[vertex1]:
+                del self.graph[vertex1]
+            if vertex1 != vertex2 and not self.graph[vertex2]:
+                del self.graph[vertex2]
+
+    def __str__(self):
+        edges = []
+        for vertex, neighbours in self.graph.items():
+            for neighbour, weight in neighbours.items():
+                edges.append("{} -[{}]- {}".format(vertex, weight, neighbour))
+        return "\n".join(sorted(edges))