nt25 0.1.1__tar.gz → 0.1.3__tar.gz

{nt25-0.1.1 → nt25-0.1.3}/.github/workflows/publish.yml

@@ -13,7 +13,7 @@ jobs:
 
     environment:
       name: publish
-      url: https://pypi.org/p/ntpy
+      url: https://pypi.org/p/nt25
 
     steps:
       - name: Checkout

{nt25-0.1.1 → nt25-0.1.3}/.gitignore

@@ -10,6 +10,11 @@ wheels/
 uv.lock
 .venv
 
+# package
+*.spec
+
+# dataset
 ds/
-*.csv
-*.xlsx
+
+# output
+output/

nt25-0.1.3/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "cSpell.words": ["bfunc"]
+}

{nt25-0.1.1 → nt25-0.1.3}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: nt25
-Version: 0.1.1
+Version: 0.1.3
 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.1 → nt25-0.1.3}/README.md

@@ -6,8 +6,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.1 → nt25-0.1.3}/pyproject.toml

@@ -1,9 +1,9 @@
 [project]
 name = "nt25"
-version = "0.1.1"
+version = "0.1.3"
 description = "Neo's Tools of Python"
 readme = "README.md"
-requires-python = ">=3.13"
+requires-python = ">=3.10"
 dependencies = [
     "matplotlib>=3.10.6",
     "openpyxl>=3.1.5",

{nt25-0.1.1 → nt25-0.1.3}/src/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')
+__data_path__ = __file__.replace('__init__.py', 'data')
+
+__all__ = ('__version__', '__data_path__', 'fio', 'calc', 'draw', 'DType')

{nt25-0.1.1 → nt25-0.1.3}/src/nt25/lib/calc.py

@@ -88,11 +88,11 @@ 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:
-      print(f'{foo}: {eq}\n  x0 = {s4e}\n')
+      print(f'{foo}: {eq}\n\n  x0 = {s4e}\n')
 
     real.append({
         'org': eq,

nt25-0.1.3/src/nt25/lib/draw.py

@@ -0,0 +1,276 @@
+from enum import Enum
+from random import sample
+
+import numpy as np
+
+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 = [
+    '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
+
+  if 'figure' not in ref:
+    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'] = {}
+
+  fig = ref['figure']
+  sub = ref['subplot']
+
+  if pos not in sub:
+    sub[pos] = fig.add_subplot(
+        pos, projection='3d') if is3D else fig.add_subplot(pos)
+
+  return sub[pos]
+
+
+def _genList(refer: list, length, random=False):
+  r = []
+
+  while len(r) < length:
+    r += sample(refer, len(refer)) if random else refer
+
+  return r[:length]
+
+
+def _genParam(pIn, pDefault, count):
+  if pIn is None:
+    pIn = pDefault
+
+  if count == 1:
+    if isinstance(pIn, (list, tuple)):
+      pIn = pIn[0]
+
+  elif len(pIn) != count:
+    # print(f"bad len {len(pIn)} != {count}")
+    pIn = None
+
+  return pIn
+
+
+def title(ref, title, pos=111, x=None, y=None, z=None):
+  result = False
+
+  if 'subplot' in ref:
+    sub = ref['subplot']
+
+    if pos in sub:
+      result = True
+      sub[pos].set_title(title)
+
+      if x:
+        sub[pos].set_xlabel(x)
+
+      if y:
+        sub[pos].set_ylabel(y)
+
+      if z:
+        sub[pos].set_zlabel(z)
+
+  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):
+
+  if ref is None:
+    ref = {}
+
+  is3D = False
+  method = Axes.scatter
+
+  match type:
+    case DType.line:
+      method = Axes.plot
+
+    case DType.func:
+      method = Axes.plot
+
+      if Func is not None and min is not None and max is not None:
+        if callable(Func):
+          Func = (Func,)
+
+        X = []
+        Y = []
+
+        for i in range(len(Func)):
+          dx = np.linspace(min[i] if isinstance(min, (list, tuple)) else min,
+                           max[i] if isinstance(max, (list, tuple)) else max)
+
+          X.append(dx)
+          Y.append([Func[i]([x]) for x in dx])
+
+    case DType.dot3d:
+      is3D = True
+      method = Axes3D.scatter
+
+    case DType.wireframe:
+      is3D = True
+      # rstride=2, cstride=2
+      method = Axes3D.plot_wireframe
+
+    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()
+
+
+def clear():
+  plot.clf()

nt25-0.1.3/src/nt25/main.py

@@ -0,0 +1,77 @@
+import os
+from nt25 import fio, calc, draw, DType, __version__, __data_path__
+
+# import timeit
+# timeit.timeit('', number=100, globals=globals())
+
+
+def main():
+  print(f"Hello from {__package__}({__version__})! ")
+
+  # [Neo] some file I/O: csv, xlsx
+  os.makedirs('output', exist_ok=True)
+
+  fio.saveCSV({
+      'Name': ['Alice', 'Bob', 'Charlie'],
+      'Age': [25.2, 30, 35],
+      'City': ['New York', 'Los Angeles', 'Chicago']
+  }, "output/out.csv")
+
+  data = fio.getXlsx(__data_path__ + '/test.xlsx')
+  fio.saveCSV(data, "output/out2.csv")
+
+  h = data[0]
+  s = data[1]
+  v = data[2]
+
+  # [Neo] some poly calculates
+  c = calc.poly(h, v)
+  ce = calc.fl2el(c)
+  print(c, ce)
+
+  foo = calc.xn2y(h, v, degree=3, output=True)
+  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]
+
+  # [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] 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(f'solveEq(750, 1.5) ~ {bar[0]['func'](y=[750], x1=1.5):.4f}')
+
+
+if __name__ == "__main__":
+  main()

nt25-0.1.3/tests/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/src/nt25/lib/draw.py

@@ -1,141 +0,0 @@
-from enum import Enum
-from random import sample
-
-import numpy as np
-
-from matplotlib.axes import Axes
-from matplotlib import pyplot as plot
-
-# import matplotlib.animation as animation
-
-
-FONTS = ['PingFang SC', 'Microsoft YaHei', 'Arial']
-COLORS = ['blue', 'red', 'orange', 'black', 'pink']
-
-
-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']
-    plot.rcParams['axes.unicode_minus'] = False
-
-  if 'subplot' not in ref:
-    ref['subplot'] = {}
-
-  fig = ref['figure']
-  sub = ref['subplot']
-
-  if pos not in sub:
-    sub[pos] = fig.add_subplot(pos)
-
-  return sub[pos]
-
-
-def _genList(refer: list, length, random=False):
-  r = []
-
-  while len(r) < length:
-    r += sample(refer, len(refer)) if random else refer
-
-  return r[:length]
-
-
-def _coord(ref, X, Y, color, pos, randomColor, method, *args, **kwargs):
-  Xa = np.array(X)
-  Ya = np.array(Y)
-
-  if Xa.shape != Ya.shape:
-    print(f"bad shape {Xa.shape} != {Ya.shape}")
-    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 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
-
-  if pos is None:
-    pos = [111] * count
-
-  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 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)
-
-  return ref
-
-
-class DType(Enum):
-  scatter = 1,
-  line = 2,
-  func = 3,
-
-
-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
-
-    case DType.line:
-      func = Axes.plot
-
-    case DType.func:
-      func = Axes.plot
-      if Func is not None and min is not None and max is not None:
-        if callable(Func):
-          Func = (Func,)
-
-        X = []
-        Y = []
-
-        for i in range(len(Func)):
-          dx = np.linspace(min[i] if isinstance(min, (list, tuple)) else min,
-                           max[i] if isinstance(max, (list, tuple)) else max)
-
-          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)
-
-  if show:
-    plot.show()
-
-  return ref
-
-
-def show():
-  plot.show()
-
-
-def clear():
-  plot.clf()

nt25-0.1.1/src/nt25/main.py

@@ -1,54 +0,0 @@
-from nt25 import fio, calc, draw, DType, __version__
-
-# import timeit
-# timeit.timeit('', number=100, globals=globals())
-
-
-def main():
-  print(f"Hello from {__package__}({__version__})! ")
-
-  # [Neo] some file I/O: csv, xlsx
-  fio.saveCSV({
-      'Name': ['Alice', 'Bob', 'Charlie'],
-      'Age': [25.2, 30, 35],
-      'City': ['New York', 'Los Angeles', 'Chicago']
-  }, "out.csv", colsInline=False)
-
-  data = fio.getXlsx('ds/qs.xlsx')
-  fio.saveCSV(data, "out2.csv")
-
-  h = data[0]
-  s = data[1]
-  v = data[2]
-
-  # [Neo] some poly calculates
-  c = calc.poly(h, v)
-  ce = calc.fl2el(c)
-  print(c, ce)
-
-  foo = calc.xn2y(h, v, degree=3, output=True)
-  bar = calc.solveEq(foo['eq'])
-
-  func = foo['func']
-  bfunc = bar[0]['func']
-
-  Y = range(1000, 2000, 200)
-  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')
-  draw.show()
-
-  # [Neo] and 3d calcs
-  foo = calc.xn2y([h, s], v, degree=3, output=False)
-  bar = calc.solveEq(foo['eq'], output=True)
-
-  if len(bar) > 0:
-    print('s> 750, 1.5 ~', bar[0]['func'](y=750, x1=1.5))
-
-
-if __name__ == "__main__":
-  main()