nbmath 0.2.3__tar.gz → 1.0.4__tar.gz

{nbmath-0.2.3 → nbmath-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbmath
-Version: 0.2.3
+Version: 1.0.4
 Summary: python零依赖数学库
 Author-email: tc0512 <tancheng_0812@qq.com>
 License: MIT
@@ -16,7 +16,7 @@ Dynamic: license-file
 
 ## 安装
 ```bash
-pip install https://ghproxy.net/https://github.com/tc0512/nbmath/releases/download/v0.2.0/nbmath-0.2.0-py3-none-any.whl
+pip install https://ghproxy.net/https://github.com/tc0512/nbmath/releases/download/v1.0.4/nbmath-1.0.4-py3-none-any.whl
 ```
 
 ## 快速开始
@@ -24,6 +24,8 @@ pip install https://ghproxy.net/https://github.com/tc0512/nbmath/releases/downlo
 from nbmath.equation import solve
 from nbmath.const import pi
 from nbmath.optimize import newton
+from nbmath.utils import is_odd
+import os
 
 #解方程
 print(solve(1, -3, 2)) #[(2+0j), (1+0j)]
@@ -35,6 +37,12 @@ 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")
+
+#判断是否为奇数
+print(is_odd(99999)) #True
 ```
 
 ## 模块介绍
@@ -46,7 +54,7 @@ print(newton(lambda x: x**2+6*x+9, 1.5, TOL, MAX_ITER)) #x接近-3,y接近0(有
 - 牛顿迭代法解高次方程
 - 不等式
 - 统一接口`solve`
-### 几何模块`nbmath.geometry`
+### 几何模块`nbmath.geo`
 - 点`Point`
 - 线段`Line`
 - 圆`Circle`
@@ -61,18 +69,26 @@ print(newton(lambda x: x**2+6*x+9, 1.5, TOL, MAX_ITER)) #x接近-3,y接近0(有
 - `np.linspace`纯python实现
 - `polyval`多项式代入求值
 - `timer`计时器
+- `is_even` `is_odd`奇偶数判断
 ### 优化算法模块`nbmath.optimize`
 - `brute`咆哮算法
 - `golden_section`黄金分割法
 - `newton`牛顿法
 - `gradient_descent`梯度下降
 - `simulated_annealing`模拟退火
+### 绘图模块`nbmath.plots`
+- `point`描点 `scatter`散点图
+- `line`线段 `fun`绘制函数F(x)
+- `rect`矩形
+- `mandelbrot` `heart`等共5个示例图案
 
 ## 示例代码
 ```python
 from nbmath.equation import solve
 from nbmath.stats import mode
 from nbmath.optimize import simulated_annealing
+from nbmath import plots as plt
+import math
 
 #求解x^4-10x^2+9=0
 roots = solve(1, 0, -10, 0, 9)
@@ -89,7 +105,18 @@ 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)
+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)
+plt.rect(1, 1, 1.5, 0.5, "red") #绘制一个左下角(1,1),长1.5,宽0.5的红色矩形
+plt.keep_window()
 ```
 
 ## 许可证
 MIT
+
+**警告**
+nbmath-1.0.0有bug，请下载nbmath-1.0.3

{nbmath-0.2.3 → nbmath-1.0.4}/README.md

@@ -4,7 +4,7 @@
 
 ## 安装
 ```bash
-pip install https://ghproxy.net/https://github.com/tc0512/nbmath/releases/download/v0.2.0/nbmath-0.2.0-py3-none-any.whl
+pip install https://ghproxy.net/https://github.com/tc0512/nbmath/releases/download/v1.0.4/nbmath-1.0.4-py3-none-any.whl
 ```
 
 ## 快速开始
@@ -12,6 +12,8 @@ pip install https://ghproxy.net/https://github.com/tc0512/nbmath/releases/downlo
 from nbmath.equation import solve
 from nbmath.const import pi
 from nbmath.optimize import newton
+from nbmath.utils import is_odd
+import os
 
 #解方程
 print(solve(1, -3, 2)) #[(2+0j), (1+0j)]
@@ -23,6 +25,12 @@ 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")
+
+#判断是否为奇数
+print(is_odd(99999)) #True
 ```
 
 ## 模块介绍
@@ -34,7 +42,7 @@ print(newton(lambda x: x**2+6*x+9, 1.5, TOL, MAX_ITER)) #x接近-3,y接近0(有
 - 牛顿迭代法解高次方程
 - 不等式
 - 统一接口`solve`
-### 几何模块`nbmath.geometry`
+### 几何模块`nbmath.geo`
 - 点`Point`
 - 线段`Line`
 - 圆`Circle`
@@ -49,18 +57,26 @@ print(newton(lambda x: x**2+6*x+9, 1.5, TOL, MAX_ITER)) #x接近-3,y接近0(有
 - `np.linspace`纯python实现
 - `polyval`多项式代入求值
 - `timer`计时器
+- `is_even` `is_odd`奇偶数判断
 ### 优化算法模块`nbmath.optimize`
 - `brute`咆哮算法
 - `golden_section`黄金分割法
 - `newton`牛顿法
 - `gradient_descent`梯度下降
 - `simulated_annealing`模拟退火
+### 绘图模块`nbmath.plots`
+- `point`描点 `scatter`散点图
+- `line`线段 `fun`绘制函数F(x)
+- `rect`矩形
+- `mandelbrot` `heart`等共5个示例图案
 
 ## 示例代码
 ```python
 from nbmath.equation import solve
 from nbmath.stats import mode
 from nbmath.optimize import simulated_annealing
+from nbmath import plots as plt
+import math
 
 #求解x^4-10x^2+9=0
 roots = solve(1, 0, -10, 0, 9)
@@ -77,7 +93,18 @@ 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)
+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)
+plt.rect(1, 1, 1.5, 0.5, "red") #绘制一个左下角(1,1),长1.5,宽0.5的红色矩形
+plt.keep_window()
 ```
 
 ## 许可证
 MIT
+
+**警告**
+nbmath-1.0.0有bug，请下载nbmath-1.0.3

{nbmath-0.2.3 → nbmath-1.0.4}/nbmath/__init__.py

@@ -1,6 +1,6 @@
 from . import const
 from . import equation
-from . import geometry
+from . import geo
 from . import plots
 from . import stats
 from . import utils
@@ -8,9 +8,9 @@ from . import utils
 __all__ = [
     'const',
     'equation', 
-    'geometry',
+    'geo',
     'plots',
     'stats',
     'utils'
 ]
-__version__ = "0.2.3"
+__version__ = "1.0.4"

{nbmath-0.2.3 → nbmath-1.0.4}/nbmath/plots/core.py

@@ -1,4 +1,6 @@
 import turtle as t
+import platform
+python_version = platform.python_version()
 _length = _height = None
 _llx = _lly = _urx = _ury = None
 def window(length, height): #窗口(t.setup)
@@ -10,6 +12,8 @@ def window(length, height): #窗口(t.setup)
     t.speed(0)
     t.tracer(0)
     t.penup()
+    print(f"Python{python_version} nbmath1.0.4")
+    print("enjoy plotting!")
 def setax(llx, lly, urx, ury): #设置坐标系范围(t.setworldcoordinates)
     global _llx, _lly, _urx , _ury
     _llx, _lly, _urx , _ury = llx, lly, urx, ury
@@ -54,7 +58,7 @@ def line(x: list, y: list, color: str, linewidth: int): #绘制线段
     t.goto(x[1], y[1])
     t.pensize(1)
     t.update()
-def plot_function(f, x_min, x_max, color: str, linewidth: int, steps: int): #函数图像y=f(x)
+def fun(f, x_min, x_max, color: str, linewidth: int, steps: int): #函数图像y=f(x)
     t.hideturtle()
     t.penup()
     dx = (x_max-x_min)/steps
@@ -68,13 +72,27 @@ 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, size: int): #散点图
+def scatter(points: list, color: str, size: list): #散点图
+    n = len(points)
+    if n!=len(size):
+        raise ValueError("length of points and size is not equal")
     t.hideturtle()
     t.penup()
     t.pencolor(color)
-    for i in points:
-        t.goto(i)
-        t.dot(size)
+    for i in range(n):
+        t.goto(points[i])
+        t.dot(size[i])
+    t.update()
+def rect(llx, lly, width, height, color):
+    t.hideturtle()
+    t.penup()
+    t.pencolor(color)
+    t.goto(llx, lly)
+    for i in range(2):
+        t.fd(width)
+        t.lt(90)
+        t.fd(height)
+        t.lt(90)
     t.update()
 def keep_window():
     t.done()

nbmath-1.0.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-1.0.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.fun(F, 0, 1, "blue", 2, 800)
+    plt.keep_window()
+if __name__ == "__main__":
+    main()

{nbmath-0.2.3 → nbmath-1.0.4}/nbmath/plots/examples/heart.py

@@ -24,7 +24,7 @@ def main():
         x = r*math.cos(i)
         y = r*math.sin(i)
         p.append((x, y))
-    plt.scatter(p, "red", 2)
+    plt.scatter(p, "red", [2]*len(p))
     plt.keep_window()
 if __name__ == "__main__":
     main()

{nbmath-0.2.3 → nbmath-1.0.4}/nbmath/plots/examples/lissajous.py

@@ -27,7 +27,7 @@ def main():
         x = ALPHA*math.sin(A*i+DELTA)
         y = BETA*math.sin(B*i)
         p.append((x, y))
-    plt.scatter(p, "green", 1)
+    plt.scatter(p, "green", [1]*len(p))
     plt.keep_window()
 if __name__ == "__main__":
     main()

nbmath-1.0.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.3 → nbmath-1.0.4}/nbmath/plots/examples/sin.py

@@ -5,7 +5,7 @@ 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.fun(lambda x:math.sin(x), -2*math.pi, 2*math.pi, "blue", 2, 800)
     plt.keep_window()
 if __name__ == "__main__":
     main()

{nbmath-0.2.3 → nbmath-1.0.4}/nbmath/utils.py

@@ -58,3 +58,7 @@ def fac(x): #阶乘
     elif x<0 and int(x)==x:
         return float('nan')
     return math.gamma(x+1)
+def is_even(x: int): #偶数判断
+    return x%2==0
+def is_odd(x: int): #奇数判断
+    return x%2==1

{nbmath-0.2.3 → nbmath-1.0.4}/nbmath.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbmath
-Version: 0.2.3
+Version: 1.0.4
 Summary: python零依赖数学库
 Author-email: tc0512 <tancheng_0812@qq.com>
 License: MIT
@@ -16,7 +16,7 @@ Dynamic: license-file
 
 ## 安装
 ```bash
-pip install https://ghproxy.net/https://github.com/tc0512/nbmath/releases/download/v0.2.0/nbmath-0.2.0-py3-none-any.whl
+pip install https://ghproxy.net/https://github.com/tc0512/nbmath/releases/download/v1.0.4/nbmath-1.0.4-py3-none-any.whl
 ```
 
 ## 快速开始
@@ -24,6 +24,8 @@ pip install https://ghproxy.net/https://github.com/tc0512/nbmath/releases/downlo
 from nbmath.equation import solve
 from nbmath.const import pi
 from nbmath.optimize import newton
+from nbmath.utils import is_odd
+import os
 
 #解方程
 print(solve(1, -3, 2)) #[(2+0j), (1+0j)]
@@ -35,6 +37,12 @@ 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")
+
+#判断是否为奇数
+print(is_odd(99999)) #True
 ```
 
 ## 模块介绍
@@ -46,7 +54,7 @@ print(newton(lambda x: x**2+6*x+9, 1.5, TOL, MAX_ITER)) #x接近-3,y接近0(有
 - 牛顿迭代法解高次方程
 - 不等式
 - 统一接口`solve`
-### 几何模块`nbmath.geometry`
+### 几何模块`nbmath.geo`
 - 点`Point`
 - 线段`Line`
 - 圆`Circle`
@@ -61,18 +69,26 @@ print(newton(lambda x: x**2+6*x+9, 1.5, TOL, MAX_ITER)) #x接近-3,y接近0(有
 - `np.linspace`纯python实现
 - `polyval`多项式代入求值
 - `timer`计时器
+- `is_even` `is_odd`奇偶数判断
 ### 优化算法模块`nbmath.optimize`
 - `brute`咆哮算法
 - `golden_section`黄金分割法
 - `newton`牛顿法
 - `gradient_descent`梯度下降
 - `simulated_annealing`模拟退火
+### 绘图模块`nbmath.plots`
+- `point`描点 `scatter`散点图
+- `line`线段 `fun`绘制函数F(x)
+- `rect`矩形
+- `mandelbrot` `heart`等共5个示例图案
 
 ## 示例代码
 ```python
 from nbmath.equation import solve
 from nbmath.stats import mode
 from nbmath.optimize import simulated_annealing
+from nbmath import plots as plt
+import math
 
 #求解x^4-10x^2+9=0
 roots = solve(1, 0, -10, 0, 9)
@@ -89,7 +105,18 @@ 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)
+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)
+plt.rect(1, 1, 1.5, 0.5, "red") #绘制一个左下角(1,1),长1.5,宽0.5的红色矩形
+plt.keep_window()
 ```
 
 ## 许可证
 MIT
+
+**警告**
+nbmath-1.0.0有bug，请下载nbmath-1.0.3

{nbmath-0.2.3 → nbmath-1.0.4}/nbmath.egg-info/SOURCES.txt

@@ -4,7 +4,7 @@ pyproject.toml
 nbmath/__init__.py
 nbmath/const.py
 nbmath/equation.py
-nbmath/geometry.py
+nbmath/geo.py
 nbmath/optimize.py
 nbmath/stats.py
 nbmath/utils.py
@@ -15,6 +15,8 @@ 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.3 → nbmath-1.0.4}/pyproject.toml

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

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

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