nbmath 0.2.0__tar.gz → 0.2.4__tar.gz

{nbmath-0.2.0 → nbmath-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbmath
-Version: 0.2.0
+Version: 0.2.4
 Summary: python零依赖数学库
 Author-email: tc0512 <tancheng_0812@qq.com>
 License: MIT
@@ -16,7 +16,7 @@ Dynamic: license-file
 
 ## 安装
 ```bash
-pip install https://github.com/tc0512/nbmath/releases/download/v0.1.7/nbmath-0.1.7-py3-none-any.whl
+pip install https://ghproxy.net/https://github.com/tc0512/nbmath/releases/download/v0.2.3/nbmath-0.2.3-py3-none-any.whl
 ```
 
 ## 快速开始
@@ -24,6 +24,7 @@ pip install https://github.com/tc0512/nbmath/releases/download/v0.1.7/nbmath-0.1
 from nbmath.equation import solve
 from nbmath.const import pi
 from nbmath.optimize import newton
+import os
 
 #解方程
 print(solve(1, -3, 2)) #[(2+0j), (1+0j)]
@@ -35,6 +36,9 @@ print(pi()) #3.141592653589793
 TOL = 1e-6
 MAX_ITER = 100
 print(newton(lambda x: x**2+6*x+9, 1.5, TOL, MAX_ITER)) #x接近-3,y接近0(有浮点误差)
+
+#绘制康托尔阶梯
+os.system("python -m nbmath.plots.examples.cantor_stair")
 ```
 
 ## 模块介绍
@@ -67,12 +71,17 @@ print(newton(lambda x: x**2+6*x+9, 1.5, TOL, MAX_ITER)) #x接近-3,y接近0(有
 - `newton`牛顿法
 - `gradient_descent`梯度下降
 - `simulated_annealing`模拟退火
+### 绘图模块`nbmath.plots`
+- `point`描点 `scatter`散点图
+- `line`线段 `plot_function`绘制函数F(x)
+- `mandelbrot` `heart`等共5个示例图案
 
 ## 示例代码
 ```python
 from nbmath.equation import solve
 from nbmath.stats import mode
 from nbmath.optimize import simulated_annealing
+from nbmath.plots import plot_function as pf
 
 #求解x^4-10x^2+9=0
 roots = solve(1, 0, -10, 0, 9)
@@ -89,6 +98,9 @@ COOLING = 0.95
 STEPS = 1000
 TOL = 1e-6
 print(simulated_annealing(F, -5, 5, TEMP, COOLING, STEPS, TOL)) #{'x': -1.581998612252256, 'fun': -2.249992603725974}
+
+#绘制y=cos(x)
+pf()
 ```
 
 ## 许可证

{nbmath-0.2.0 → nbmath-0.2.4}/README.md

@@ -4,7 +4,7 @@
 
 ## 安装
 ```bash
-pip install https://github.com/tc0512/nbmath/releases/download/v0.1.7/nbmath-0.1.7-py3-none-any.whl
+pip install https://ghproxy.net/https://github.com/tc0512/nbmath/releases/download/v0.2.3/nbmath-0.2.3-py3-none-any.whl
 ```
 
 ## 快速开始
@@ -12,6 +12,7 @@ pip install https://github.com/tc0512/nbmath/releases/download/v0.1.7/nbmath-0.1
 from nbmath.equation import solve
 from nbmath.const import pi
 from nbmath.optimize import newton
+import os
 
 #解方程
 print(solve(1, -3, 2)) #[(2+0j), (1+0j)]
@@ -23,6 +24,9 @@ print(pi()) #3.141592653589793
 TOL = 1e-6
 MAX_ITER = 100
 print(newton(lambda x: x**2+6*x+9, 1.5, TOL, MAX_ITER)) #x接近-3,y接近0(有浮点误差)
+
+#绘制康托尔阶梯
+os.system("python -m nbmath.plots.examples.cantor_stair")
 ```
 
 ## 模块介绍
@@ -55,12 +59,17 @@ print(newton(lambda x: x**2+6*x+9, 1.5, TOL, MAX_ITER)) #x接近-3,y接近0(有
 - `newton`牛顿法
 - `gradient_descent`梯度下降
 - `simulated_annealing`模拟退火
+### 绘图模块`nbmath.plots`
+- `point`描点 `scatter`散点图
+- `line`线段 `plot_function`绘制函数F(x)
+- `mandelbrot` `heart`等共5个示例图案
 
 ## 示例代码
 ```python
 from nbmath.equation import solve
 from nbmath.stats import mode
 from nbmath.optimize import simulated_annealing
+from nbmath.plots import plot_function as pf
 
 #求解x^4-10x^2+9=0
 roots = solve(1, 0, -10, 0, 9)
@@ -77,6 +86,9 @@ COOLING = 0.95
 STEPS = 1000
 TOL = 1e-6
 print(simulated_annealing(F, -5, 5, TEMP, COOLING, STEPS, TOL)) #{'x': -1.581998612252256, 'fun': -2.249992603725974}
+
+#绘制y=cos(x)
+pf()
 ```
 
 ## 许可证

{nbmath-0.2.0 → nbmath-0.2.4}/nbmath/__init__.py

@@ -13,4 +13,4 @@ __all__ = [
     'stats',
     'utils'
 ]
-__version__ = "0.1.6"
+__version__ = "0.2.4"

{nbmath-0.2.0 → nbmath-0.2.4}/nbmath/optimize.py

@@ -9,7 +9,8 @@ def brute(f, x_min, x_max, steps: int): #咆哮算法
         x+=step_length
     fun = min(results)
     ind = results.index(fun)
-    return {"x": results[ind], "fun": fun}
+    x_opt = x_min+ind*step_length
+    return {"x": x_opt, "fun": fun}
 def golden_section(f, x_min, x_max, tol): #黄金分割法
     phi = (math.sqrt(5)-1)/2
     x1 = x_max-phi*(x_max-x_min)

nbmath-0.2.4/nbmath/plots/__init__.py

@@ -0,0 +1,2 @@
+from .core import *
+from . import examples

nbmath-0.2.0/nbmath/plots.py → nbmath-0.2.4/nbmath/plots/core.py

@@ -15,6 +15,7 @@ def setax(llx, lly, urx, ury): #设置坐标系范围(t.setworldcoordinates)
     _llx, _lly, _urx , _ury = llx, lly, urx, ury
     t.setworldcoordinates(llx, lly, urx, ury)
 def drawaxhline(): #绘制坐标轴
+    t.hideturtle()
     global _length, _height, _llx, _lly, _urx , _ury
     if None in (_length, _height):
         raise ValueError("please use 'window' first to create a window")
@@ -35,6 +36,7 @@ def drawaxhline(): #绘制坐标轴
     t.penup()
     t.update()
 def point(x, y, color: str, size: int, label: str): #描点
+    t.hideturtle()
     t.penup()
     t.goto(x, y)
     t.pencolor(color)
@@ -43,6 +45,7 @@ def point(x, y, color: str, size: int, label: str): #描点
     t.penup()
     t.update()
 def line(x: list, y: list, color: str, linewidth: int): #绘制线段
+    t.hideturtle()
     t.penup()
     t.goto(x[0], y[0])
     t.pendown()
@@ -52,6 +55,7 @@ def line(x: list, y: list, color: str, linewidth: int): #绘制线段
     t.pensize(1)
     t.update()
 def plot_function(f, x_min, x_max, color: str, linewidth: int, steps: int): #函数图像y=f(x)
+    t.hideturtle()
     t.penup()
     dx = (x_max-x_min)/steps
     for i in range(steps+1):
@@ -64,12 +68,13 @@ def plot_function(f, x_min, x_max, color: str, linewidth: int, steps: int): #函
             t.pensize(linewidth)
     t.penup()
     t.update()
-def scatter(points: list, color: str): #散点图
+def scatter(points: list, color: str, size: int): #散点图
+    t.hideturtle()
     t.penup()
     t.pencolor(color)
     for i in points:
         t.goto(i)
-        t.dot(5)
+        t.dot(size)
     t.update()
 def keep_window():
     t.done()

nbmath-0.2.4/nbmath/plots/examples/__init__.py

@@ -0,0 +1,7 @@
+from . import sin
+from . import heart
+from . import lissajous
+from . import cantor_stair
+from . import mandelbrot
+
+__all__ = ['sin', 'heart', 'lissajous', 'cantor_stair', 'mandelbrot']

nbmath-0.2.4/nbmath/plots/examples/cantor_stair.py

@@ -0,0 +1,20 @@
+#!/usr/bin/env python3
+import math
+from nbmath.plots import core as plt
+def F(x, depth=20):
+    if depth == 0:
+        return x
+    if x < 1/3:
+        return 0.5 * F(3*x, depth-1)
+    elif x <= 2/3:
+        return 0.5
+    else:
+        return 0.5 + 0.5 * F(3*x - 2, depth-1)
+def main():
+    plt.window(720, 720)
+    plt.setax(-0.5, -0.5, 1.5, 1.5)
+    plt.drawaxhline()
+    plt.plot_function(F, 0, 1, "blue", 2, 800)
+    plt.keep_window()
+if __name__ == "__main__":
+    main()

nbmath-0.2.4/nbmath/plots/examples/heart.py

@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+import math
+from nbmath.plots import core as plt
+def linspace(start, end, steps):
+    if steps==0:
+        return []
+    elif steps==1:
+        return [start]
+    dx = (end-start)/steps
+    result = []
+    for i in range(steps+1):
+        x = start+i*dx
+        result.append(x)
+    return result
+def main():
+    plt.window(720, 720)
+    plt.setax(-3, -3, 3, 3)
+    plt.drawaxhline()
+    A = 1
+    theta = linspace(-2*math.pi, 2*math.pi, 2000)
+    p = []
+    for i in theta:
+        r = A*(1-math.cos(i))
+        x = r*math.cos(i)
+        y = r*math.sin(i)
+        p.append((x, y))
+    plt.scatter(p, "red", 2)
+    plt.keep_window()
+if __name__ == "__main__":
+    main()

nbmath-0.2.4/nbmath/plots/examples/lissajous.py

@@ -0,0 +1,33 @@
+#!/usr/bin/env python3
+import math
+from nbmath.plots import core as plt
+def linspace(start, end, steps):
+    if steps==0:
+        return []
+    elif steps==1:
+        return [start]
+    dx = (end-start)/steps
+    result = []
+    for i in range(steps+1):
+        x = start+i*dx
+        result.append(x)
+    return result
+def main():
+    plt.window(720, 720)
+    plt.setax(-1.5, -1.5, 1.5, 1.5)
+    plt.drawaxhline()
+    ALPHA = 1
+    BETA = 1
+    A = 5
+    B = 4
+    DELTA = math.pi/2
+    t = linspace(0, 2*math.pi, 5000)
+    p = []
+    for i in t:
+        x = ALPHA*math.sin(A*i+DELTA)
+        y = BETA*math.sin(B*i)
+        p.append((x, y))
+    plt.scatter(p, "green", 1)
+    plt.keep_window()
+if __name__ == "__main__":
+    main()

nbmath-0.2.4/nbmath/plots/examples/mandelbrot.py

@@ -0,0 +1,38 @@
+#!/usr/bin/env python3
+import sys
+import math
+from nbmath.plots import core as plt
+def mandelbrot(c, max_iter=100):
+    z = 0
+    for n in range(max_iter):
+        if abs(z) > 2:
+            return n
+        z = z*z + c
+    return max_iter
+def main():
+    width, height = 800, 600
+    xmin, xmax = -2.5, 1.5
+    ymin, ymax = -1.5, 1.5
+    plt.window(width, height)
+    plt.setax(xmin, ymin, xmax, ymax)
+    plt.drawaxhline()
+    total = width * height
+    points = []
+    for i in range(height):
+        for j in range(width):
+            x = xmin + (xmax - xmin) * j / width
+            y = ymin + (ymax - ymin) * i / height
+            c = complex(x, y)
+            iter_count = mandelbrot(c)
+            if iter_count == 100:
+                color = "black"
+            else:
+                brightness = int(255 * iter_count / 100)
+                color = f"#{brightness:02x}{brightness:02x}{brightness:02x}"
+            points.append((j, i))
+            plt.point(j, i, color, 1, "")
+            print(f"\rplotting...{i*width+j}/{total}", end="")
+    print("Ok,done.")
+    plt.keep_window()
+if __name__ == "__main__":
+    main()

nbmath-0.2.4/nbmath/plots/examples/sin.py

@@ -0,0 +1,11 @@
+#!/usr/bin/env python3
+import math
+from nbmath.plots import core as plt
+def main():
+    plt.window(800, 600)
+    plt.setax(-2*math.pi, -1.5*math.pi, 2*math.pi, 1.5*math.pi)
+    plt.drawaxhline()
+    plt.plot_function(lambda x:math.sin(x), -2*math.pi, 2*math.pi, "blue", 2, 800)
+    plt.keep_window()
+if __name__ == "__main__":
+    main()

{nbmath-0.2.0 → nbmath-0.2.4}/nbmath.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbmath
-Version: 0.2.0
+Version: 0.2.4
 Summary: python零依赖数学库
 Author-email: tc0512 <tancheng_0812@qq.com>
 License: MIT
@@ -16,7 +16,7 @@ Dynamic: license-file
 
 ## 安装
 ```bash
-pip install https://github.com/tc0512/nbmath/releases/download/v0.1.7/nbmath-0.1.7-py3-none-any.whl
+pip install https://ghproxy.net/https://github.com/tc0512/nbmath/releases/download/v0.2.3/nbmath-0.2.3-py3-none-any.whl
 ```
 
 ## 快速开始
@@ -24,6 +24,7 @@ pip install https://github.com/tc0512/nbmath/releases/download/v0.1.7/nbmath-0.1
 from nbmath.equation import solve
 from nbmath.const import pi
 from nbmath.optimize import newton
+import os
 
 #解方程
 print(solve(1, -3, 2)) #[(2+0j), (1+0j)]
@@ -35,6 +36,9 @@ print(pi()) #3.141592653589793
 TOL = 1e-6
 MAX_ITER = 100
 print(newton(lambda x: x**2+6*x+9, 1.5, TOL, MAX_ITER)) #x接近-3,y接近0(有浮点误差)
+
+#绘制康托尔阶梯
+os.system("python -m nbmath.plots.examples.cantor_stair")
 ```
 
 ## 模块介绍
@@ -67,12 +71,17 @@ print(newton(lambda x: x**2+6*x+9, 1.5, TOL, MAX_ITER)) #x接近-3,y接近0(有
 - `newton`牛顿法
 - `gradient_descent`梯度下降
 - `simulated_annealing`模拟退火
+### 绘图模块`nbmath.plots`
+- `point`描点 `scatter`散点图
+- `line`线段 `plot_function`绘制函数F(x)
+- `mandelbrot` `heart`等共5个示例图案
 
 ## 示例代码
 ```python
 from nbmath.equation import solve
 from nbmath.stats import mode
 from nbmath.optimize import simulated_annealing
+from nbmath.plots import plot_function as pf
 
 #求解x^4-10x^2+9=0
 roots = solve(1, 0, -10, 0, 9)
@@ -89,6 +98,9 @@ COOLING = 0.95
 STEPS = 1000
 TOL = 1e-6
 print(simulated_annealing(F, -5, 5, TEMP, COOLING, STEPS, TOL)) #{'x': -1.581998612252256, 'fun': -2.249992603725974}
+
+#绘制y=cos(x)
+pf()
 ```
 
 ## 许可证

nbmath-0.2.4/nbmath.egg-info/SOURCES.txt

@@ -0,0 +1,22 @@
+LICENSE
+README.md
+pyproject.toml
+nbmath/__init__.py
+nbmath/const.py
+nbmath/equation.py
+nbmath/geometry.py
+nbmath/optimize.py
+nbmath/stats.py
+nbmath/utils.py
+nbmath.egg-info/PKG-INFO
+nbmath.egg-info/SOURCES.txt
+nbmath.egg-info/dependency_links.txt
+nbmath.egg-info/top_level.txt
+nbmath/plots/__init__.py
+nbmath/plots/core.py
+nbmath/plots/examples/__init__.py
+nbmath/plots/examples/cantor_stair.py
+nbmath/plots/examples/heart.py
+nbmath/plots/examples/lissajous.py
+nbmath/plots/examples/mandelbrot.py
+nbmath/plots/examples/sin.py

{nbmath-0.2.0 → nbmath-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nbmath"
-version = "0.2.0"
+version = "0.2.4"
 description = "python零依赖数学库"
 authors = [
     {name = "tc0512", email = "tancheng_0812@qq.com"}

nbmath-0.2.0/nbmath.egg-info/SOURCES.txt

@@ -1,15 +0,0 @@
-LICENSE
-README.md
-pyproject.toml
-nbmath/__init__.py
-nbmath/const.py
-nbmath/equation.py
-nbmath/geometry.py
-nbmath/optimize.py
-nbmath/plots.py
-nbmath/stats.py
-nbmath/utils.py
-nbmath.egg-info/PKG-INFO
-nbmath.egg-info/SOURCES.txt
-nbmath.egg-info/dependency_links.txt
-nbmath.egg-info/top_level.txt