nt25 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

nt25/__init__.py

@@ -4,4 +4,6 @@ from .lib import fio, calc, draw
 from .lib.draw import DType
 
 __version__ = meta.version(str(__package__))
-__all__ = ('__version__', 'fio', 'calc', 'draw', 'DType')
+__samples_path__ = __file__.replace('__init__.py', 'samples')
+
+__all__ = ('__version__', '__samples_path__', 'fio', 'calc', 'draw', 'DType')

nt25/lib/calc.py

@@ -88,7 +88,7 @@ def solveEq(eq, output=False, foo='solve'):
     if 'I' in sol:
       continue
 
-    func = _genFunc(foo, 'y, x1=0', sol)
+    func = _genFunc(foo, 'y, x1=0', sol.replace('y', 'y[0]'))
     s4e = re.sub(r'([-]?\d*\.\d+)', lambda m: str2e(m.group(0)), sol)
 
     if output:

nt25/lib/draw.py

@@ -3,23 +3,61 @@ from random import sample
 
 import numpy as np
 
-from matplotlib.axes import Axes
 from matplotlib import pyplot as plot
+from matplotlib.axes import Axes
+from mpl_toolkits.mplot3d import Axes3D
+
+from . import calc
 
 # import matplotlib.animation as animation
 
 
-FONTS = ['PingFang SC', 'Microsoft YaHei', 'Arial']
+FONTS = [
+    'Microsoft YaHei',
+    'PingFang SC',
+    'Arial Unicode MS',
+    'Noto Sans CJK SC',
+    'Arial'
+]
+
 COLORS = ['blue', 'red', 'orange', 'black', 'pink']
 
+REFS = []
+
+
+class DType(Enum):
+  dot = 1,
+  line = 2,
+  func = 3,
+  dot3d = 4,
+  wireframe = 5,
+  surface = 6,
+
+
+def onClose(event):
+  global REFS
+
+  for r in REFS:
+    del r['figure']
+    del r['subplot']
+
+  REFS.clear()
+
+
+def _getPlot(ref, pos, is3D):
+  # def _getPlot(ref, pos, is3D) -> Axes | Axes3D:
+  global REFS
 
-def _getPlot(ref, pos, font='Roboto') -> Axes:
   if 'figure' not in ref:
-    ref['figure'] = plot.figure()
-    plot.rcParams['font.sans-serif'] = [font] + FONTS
-    # plot.rcParams['font.sans-serif'] = ['Arial']
+    fig = plot.figure()
+    fig.canvas.mpl_connect('close_event', onClose)
+
+    plot.rcParams['font.sans-serif'] = FONTS
     plot.rcParams['axes.unicode_minus'] = False
 
+    ref['figure'] = fig
+    REFS.append(ref)
+
   if 'subplot' not in ref:
     ref['subplot'] = {}
 
@@ -27,7 +65,8 @@ def _getPlot(ref, pos, font='Roboto') -> Axes:
   sub = ref['subplot']
 
   if pos not in sub:
-    sub[pos] = fig.add_subplot(pos)
+    sub[pos] = fig.add_subplot(
+        pos, projection='3d') if is3D else fig.add_subplot(pos)
 
   return sub[pos]
 
@@ -41,75 +80,70 @@ def _genList(refer: list, length, random=False):
   return r[:length]
 
 
-def _coord(ref, X, Y, color, pos, randomColor, method, *args, **kwargs):
-  Xa = np.array(X)
-  Ya = np.array(Y)
+def _genParam(pIn, pDefault, count):
+  if pIn is None:
+    pIn = pDefault
 
-  if Xa.shape != Ya.shape:
-    print(f"bad shape {Xa.shape} != {Ya.shape}")
-    return
+  if count == 1:
+    if isinstance(pIn, (list, tuple)):
+      pIn = pIn[0]
 
-  count = 1
-  # count = Xa.shape[0] if len(Xa.shape) > 1 else 1
+  elif len(pIn) != count:
+    # print(f"bad len {len(pIn)} != {count}")
+    pIn = None
 
-  if len(Xa.shape) > 1:
-    count = Xa.shape[0]
-    if count == 1:
-      X = X[0]
-      Y = Y[0]
+  return pIn
 
-  if color is None:
-    color = _genList(COLORS, count, random=randomColor)
 
-  if count == 1:
-    if isinstance(color, (list, tuple)):
-      color = color[0]
-  elif len(color) != count:
-    print(f"bad color.len {len(color)} != {count}")
-    return
+def title(ref, title, pos=111, x=None, y=None, z=None):
+  result = False
 
-  if pos is None:
-    pos = [111] * count
+  if 'subplot' in ref:
+    sub = ref['subplot']
 
-  if count == 1:
-    if isinstance(pos, (list, tuple)):
-      pos = pos[0]
-  elif len(pos) != count:
-    print(f"bad pos.len {len(pos)} != {count}")
-    return
+    if pos in sub:
+      result = True
+      sub[pos].set_title(title)
 
-  if count > 1 and isinstance(pos, list):
-    for i in range(count):
-      p = _getPlot(ref, pos[i])
-      method(p, X[i], Y[i], color=color[i], *args, **kwargs)
-  else:
-    p = _getPlot(ref, pos)
-    method(p, X, Y, color=color, *args, **kwargs)
+      if x:
+        sub[pos].set_xlabel(x)
 
-  return ref
+      if y:
+        sub[pos].set_ylabel(y)
 
+      if z:
+        sub[pos].set_zlabel(z)
 
-class DType(Enum):
-  scatter = 1,
-  line = 2,
-  func = 3,
+  return result
+
+
+def _gen3DXY(X, Y, extend=0.2):
+  dx = (max(X) - min(X)) * extend
+  d0 = np.linspace(min(X) - dx, max(X) + dx)
+
+  dy = (max(Y) - min(Y)) * extend
+  d1 = np.linspace(min(Y) - dy, max(Y) + dy)
 
+  return np.meshgrid(d0, d1)
+
+
+def draw(type=DType.dot, X=None, Y=None, Z=None, Func=None, min=None, max=None,
+         ref=None, pos=None, label=None, color=None, randomColor=False,
+         labelLocation='upper left', *args, **kwargs):
 
-def d2d(type=DType.scatter, X=None, Y=None, Func=None, min=None, max=None,
-        ref=None, color=None, pos=None, randomColor=False, show=False,
-        *args, **kwargs):
   if ref is None:
     ref = {}
 
-  match type:
-    case DType.scatter:
-      func = Axes.scatter
+  is3D = False
+  method = Axes.scatter
 
+  match type:
     case DType.line:
-      func = Axes.plot
+      method = Axes.plot
 
     case DType.func:
-      func = Axes.plot
+      method = Axes.plot
+
       if Func is not None and min is not None and max is not None:
         if callable(Func):
           Func = (Func,)
@@ -124,15 +158,116 @@ def d2d(type=DType.scatter, X=None, Y=None, Func=None, min=None, max=None,
           X.append(dx)
           Y.append([Func[i]([x]) for x in dx])
 
-  ref = _coord(ref, X, Y, color=color, pos=pos, randomColor=randomColor,
-               method=func, *args, **kwargs)
+    case DType.dot3d:
+      is3D = True
+      method = Axes3D.scatter
+
+    case DType.wireframe:
+      is3D = True
+      # rstride=2, cstride=2
+      method = Axes3D.plot_wireframe
 
-  if show:
-    plot.show()
+    case DType.surface:
+      is3D = True
+      # cmap='Pastel2_r', antialiased=True
+      method = Axes3D.plot_surface
+
+  if X is None or Y is None:
+    print("no X/Y to draw")
+    return
+
+  Xa = np.array(X)
+  Ya = np.array(Y)
+
+  if Xa.shape != Ya.shape:
+    print(f"bad shape {Xa.shape} != {Ya.shape}")
+    return
+
+  if type == DType.dot3d:
+    if Z is None:
+      print("Z cannot be None")
+      return
+
+    Za = np.array(Z)
+    if Xa.shape != Za.shape:
+      print(f"bad shape {Xa.shape} == {Ya.shape} != {Za.shape}")
+      return
+
+  elif is3D:
+    if Z is not None and Func is None:
+      Za = np.array(Z)
+      if Xa.shape != Za.shape:
+        print(f"bad shape {Xa.shape} == {Ya.shape} != {Za.shape}")
+        return
+
+      F = calc.xn2y([X, Y], Z, degree=3)
+      Func = F['func']
+
+    if Func is None:
+      print("Func cannot be None")
+      return
+
+    if callable(Func):
+      X, Y = _gen3DXY(X, Y)
+      Z = Func([X, Y])
+    else:
+      print("Func need callable")
+      return
+
+  count = 1
+  # count = Xa.shape[0] if len(Xa.shape) > 1 else 1
+
+  if len(Xa.shape) > 1:
+    count = Xa.shape[0]
+    if count == 1:
+      X = X[0]
+      Y = Y[0]
+
+      if Z is not None and isinstance(Z, list):
+        Z = Z[0]
+
+  if is3D and type != DType.dot3d:
+    count = 1
+
+  pos = _genParam(pos, [111] * count, count)
+  label = _genParam(label, [None] * count, count)
+  color = _genParam(color, _genList(COLORS, count, random=randomColor), count)
+
+  if pos is None or color is None:
+    print("bad length")
+    return
+
+  if count == 1:
+    p = _getPlot(ref, pos, is3D)
+    _draw(method, p, type, X, Y, Z, label=label, color=color, *args, **kwargs)
+
+  elif (isinstance(pos, list) and
+        isinstance(label, list) and isinstance(color, list)):
+
+    for i in range(count):
+      p = _getPlot(ref, pos[i], is3D)
+      _draw(method, p, type, X[i], Y[i], Z[i]
+            if isinstance(Z, list) else None, label, color, *args, **kwargs)
+
+  if label is not None:
+    plot.legend(loc=labelLocation)
 
   return ref
 
 
+def _draw(method, p, type, x, y, z, label, color, *args, **kwargs):
+  match type:
+    case DType.dot3d | DType.wireframe:
+      method(p, x, y, z, label=label, color=color,
+             antialiased=True, *args, **kwargs)
+
+    case DType.surface:
+      method(p, x, y, z, label=label, antialiased=True, *args, **kwargs)
+
+    case _:
+      method(p, x, y, label=label, color=color, *args, **kwargs)
+
+
 def show():
   plot.show()
 

nt25/main.py

@@ -1,4 +1,4 @@
-from nt25 import fio, calc, draw, DType, __version__
+from nt25 import fio, calc, draw, DType, __version__, __samples_path__
 
 # import timeit
 # timeit.timeit('', number=100, globals=globals())
@@ -14,7 +14,7 @@ def main():
       'City': ['New York', 'Los Angeles', 'Chicago']
   }, "out.csv", colsInline=False)
 
-  data = fio.getXlsx('ds/qs.xlsx')
+  data = fio.getXlsx(__samples_path__ + '/test.xlsx')
   fio.saveCSV(data, "out2.csv")
 
   h = data[0]
@@ -27,27 +27,47 @@ def main():
   print(c, ce)
 
   foo = calc.xn2y(h, v, degree=3, output=True)
-  bar = calc.solveEq(foo['eq'])
+  bar = calc.solveEq(foo['eq'], output=False)
 
   func = foo['func']
   bfunc = bar[0]['func']
 
   Y = range(1000, 2000, 200)
-  X = [bfunc(y) for y in Y]
+  X = [bfunc([y]) for y in Y]
 
-  # [Neo] draw 2d with types
-  ref = {}
-  draw.d2d(X=h, Y=v, ref=ref)
-  draw.d2d(type=DType.scatter, X=X, Y=Y, ref=ref, color='red', s=120)
-  draw.d2d(type=DType.func, Func=func, min=40, max=60, ref=ref, color='red')
+  # [Neo] draw with title, data dots
+  ref = draw.draw(X=h, Y=v)
+  draw.title(ref, "title", x='xlabel', y='ylabel')
+  draw.draw(type=DType.dot, X=X, Y=Y, ref=ref, color='red', s=120)
   draw.show()
 
-  # [Neo] and 3d calcs
-  foo = calc.xn2y([h, s], v, degree=3, output=False)
+  # [Neo] draw with function, split in two
+  draw.draw(type=DType.func, Func=func, min=40, max=60, ref=ref, pos=121,
+            label='func', color='red')
+  draw.draw(type=DType.func, Func=bfunc, min=0, max=4000, ref=ref, pos=122,
+            label='bfunc', labelLocation='upper right')
+  draw.show()
+
+  # [Neo] draw with 3d dots, and function in surface
+  ref = draw.draw(DType.dot3d, X=h, Y=s, Z=v, color='red', pos=121)
+  draw.title(ref, "三维", pos=121)
+
+  foo = calc.xn2y([h, s], v, degree=3, output=True)
+  func = foo['func']
+
+  # change default color
+  draw.draw(DType.surface, h, s, Func=func,
+            ref=ref, pos=121, cmap='Pastel2_r',)
+  # auto-gen surface with dots, change default gird size
+  draw.draw(DType.wireframe, h, s, v,
+            ref=ref, pos=122, rstride=2, cstride=2)
+  draw.show()
+
+  # [Neo] and 3d solve equal
   bar = calc.solveEq(foo['eq'], output=True)
 
   if len(bar) > 0:
-    print('s> 750, 1.5 ~', bar[0]['func'](y=750, x1=1.5))
+    print('s> 750, 1.5 ~', bar[0]['func'](y=[750], x1=1.5))
 
 
 if __name__ == "__main__":

nt25/scripts/test3d.py

@@ -0,0 +1,11 @@
+from nt25 import fio, draw, DType
+
+csv = fio.getCSV('ds/92.csv', width=11, startLine=1)
+if isinstance(csv, list):
+  P = csv[0]
+  Pa = csv[1]
+  R = csv[9]
+
+  ref = draw.draw(DType.dot3d, P, Pa, R)
+  draw.draw(DType.wireframe, P, Pa, R, ref=ref, color='orange')
+  draw.show()

{nt25-0.1.1.dist-info → nt25-0.1.2.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: nt25
-Version: 0.1.1
+Version: 0.1.2
 Summary: Neo's Tools of Python
-Requires-Python: >=3.13
+Requires-Python: >=3.10
 Requires-Dist: matplotlib>=3.10.6
 Requires-Dist: openpyxl>=3.1.5
 Requires-Dist: pandas>=2.3.2
@@ -18,8 +18,11 @@ Neo's Tools of Python in 2025
 
 - [x] fio
 - [x] calc
-- [x] draw with 2d
-- [ ] draw with 3d
+- [x] draw
+- [ ] mysql
+- [ ] redis
+- [ ] maptrans
+- [ ] ttp
 
 ## scripts from init
 

nt25-0.1.2.dist-info/RECORD

@@ -0,0 +1,10 @@
+nt25/__init__.py,sha256=1KKnRfR3-cwA0HPzYYIr4Y3MfHGIcV33gHGlK5j1qOo,283
+nt25/main.py,sha256=H7rpN_DHcd6vbKWjO0mxxETMC7t_u_4Qp-XBP_hSH7A,2046
+nt25/lib/calc.py,sha256=GKDuC8k1v4lwxFThyZx7CGNjPHeyVH3FTgNU2zCWJ44,2263
+nt25/lib/draw.py,sha256=OKTlkkNVUz_LGBA9Gk7fjcnbbbl7e_hT8nWKkcfeg2k,5642
+nt25/lib/fio.py,sha256=WvHpG6QYR1NE19Ss3Sy2FdajTxibX5SVW3PyC5Y5Krk,2525
+nt25/scripts/test3d.py,sha256=DIvCaUc2NoALTxu4E9h4oO9dvb_C2XI0R3QzR_PXR3c,274
+nt25-0.1.2.dist-info/METADATA,sha256=m2_4PF9bcl7BkQz6ICj8B1RjpGc6uHG3KxGwbzuQPDI,528
+nt25-0.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+nt25-0.1.2.dist-info/entry_points.txt,sha256=mApCFA2DAwrQrcWa5JqcKq7lPzogm_Yi4EejBUo-Of8,40
+nt25-0.1.2.dist-info/RECORD,,

nt25-0.1.1.dist-info/RECORD

@@ -1,9 +0,0 @@
-nt25/__init__.py,sha256=3pJhB9zM_qRUTiAj98xwwd-8muwSgGC0-Sd_CEYi4Tc,200
-nt25/main.py,sha256=TkgLVeEm3GENii-JVUhLVIfO31N9QLjwkRbELxj1k4A,1256
-nt25/lib/calc.py,sha256=FHPHtHw7Mcm3PlVoC1c3ghpapZe0GhPVG5-mmfHkDaw,2242
-nt25/lib/draw.py,sha256=5llf6Q3ljBNBkIEphZzL7Xv0ZZu8i2CTBHYmRzH84lU,3020
-nt25/lib/fio.py,sha256=WvHpG6QYR1NE19Ss3Sy2FdajTxibX5SVW3PyC5Y5Krk,2525
-nt25-0.1.1.dist-info/METADATA,sha256=b9YUoAt5tU5DL5DfstJUFV175yQLrCLjn-o6hbya_gs,506
-nt25-0.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-nt25-0.1.1.dist-info/entry_points.txt,sha256=mApCFA2DAwrQrcWa5JqcKq7lPzogm_Yi4EejBUo-Of8,40
-nt25-0.1.1.dist-info/RECORD,,