oafuncs 0.0.59__tar.gz → 0.0.61__tar.gz

{oafuncs-0.0.59 → oafuncs-0.0.61}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: oafuncs
-Version: 0.0.59
+Version: 0.0.61
 Summary: My short description for my project.
-Home-page: https://github.com/Industry-Pays/oafuncs
+Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu
 Author-email: liukun0312@stu.ouc.edu.cn
 License: MIT
@@ -48,12 +48,12 @@ Python Function
 
 <mark>注</mark>：若有需求，可邮件至`liukun0312@stu.ouc.edu.cn`，能力范围内可考虑实现
 
-**精力有限，部分函数使用说明文档未能及时更新/添加，可参考`结构`部分简述，再使用`OAFuncs.oa_help.use('func_name')`函数调取函数本身说明**
+**精力有限，部分函数使用说明文档未能及时更新/添加，可参考`结构`部分简述，再使用`oafuncs.oa_help.use('func_name')`函数调取函数本身说明**
 
 ## PyPI
 
 ```html
-https://pypi.org/project/OAFuncs
+https://pypi.org/project/oafuncs
 ```
 
 ## Github

{oafuncs-0.0.59 → oafuncs-0.0.61}/README.md

@@ -14,12 +14,12 @@ Python Function
 
 <mark>注</mark>：若有需求，可邮件至`liukun0312@stu.ouc.edu.cn`，能力范围内可考虑实现
 
-**精力有限，部分函数使用说明文档未能及时更新/添加，可参考`结构`部分简述，再使用`OAFuncs.oa_help.use('func_name')`函数调取函数本身说明**
+**精力有限，部分函数使用说明文档未能及时更新/添加，可参考`结构`部分简述，再使用`oafuncs.oa_help.use('func_name')`函数调取函数本身说明**
 
 ## PyPI
 
 ```html
-https://pypi.org/project/OAFuncs
+https://pypi.org/project/oafuncs
 ```
 
 ## Github

{oafuncs-0.0.59 → oafuncs-0.0.61}/oafuncs/oa_cmap.py

@@ -4,8 +4,8 @@
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-09-17 16:55:11
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-10-06 19:34:57
-FilePath: \\Python\\My_Funcs\\OAFuncs\\OAFuncs\\oa_cmap.py
+LastEditTime: 2024-11-21 13:14:24
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_cmap.py
 Description:  
 EditPlatform: vscode
 ComputerInfo: XPS 15 9510
@@ -18,8 +18,7 @@ import matplotlib as mpl
 import matplotlib.pyplot as plt
 import numpy as np
 
-__all__ = ['show', 'extract_colors', 'create_custom',
-           'create_diverging', 'create_5rgb_txt']
+__all__ = ['show', 'extract_colors', 'create_custom', 'create_diverging', 'create_5rgb_txt']
 
 # ** 将cmap用填色图可视化（官网摘抄函数）
 
@@ -34,8 +33,7 @@ def show(colormaps: list):
     np.random.seed(19680801)
     data = np.random.randn(30, 30)
     n = len(colormaps)
-    fig, axs = plt.subplots(1, n, figsize=(n * 2 + 2, 3),
-                            constrained_layout=True, squeeze=False)
+    fig, axs = plt.subplots(1, n, figsize=(n * 2 + 2, 3), constrained_layout=True, squeeze=False)
     for [ax, cmap] in zip(axs.flat, colormaps):
         psm = ax.pcolormesh(data, cmap=cmap, rasterized=True, vmin=-4, vmax=4)
         fig.colorbar(psm, ax=ax)
@@ -67,11 +65,9 @@ def create_custom(colors: list, nodes=None):  # 利用颜色快速配色
                 c_map = mk_cmap(['aliceblue','skyblue','deepskyblue'],[0.0,0.5,1.0])
     '''
     if nodes is None:  # 采取自动分配比例
-        cmap_color = mpl.colors.LinearSegmentedColormap.from_list(
-            'mycmap', colors)
+        cmap_color = mpl.colors.LinearSegmentedColormap.from_list('mycmap', colors)
     else:  # 按照提供比例分配
-        cmap_color = mpl.colors.LinearSegmentedColormap.from_list(
-            "mycmap", list(zip(nodes, colors)))
+        cmap_color = mpl.colors.LinearSegmentedColormap.from_list("mycmap", list(zip(nodes, colors)))
     return cmap_color
 
 # ** 自制diverging型cmap，默认中间为白色
@@ -91,8 +87,7 @@ def create_diverging(colors: list):
     newcolors = colors
     if n % 2 == 0:
         newcolors.insert(int(n / 2), '#ffffff')  # 偶数个颜色，中间为白色
-    cmap_color = mpl.colors.LinearSegmentedColormap.from_list(
-        "mycmap", list(zip(nodes, newcolors)))
+    cmap_color = mpl.colors.LinearSegmentedColormap.from_list("mycmap", list(zip(nodes, newcolors)))
     return cmap_color
 
 # ** 根据RGB的txt文档制作色卡（利用Grads调色盘）
@@ -129,8 +124,7 @@ if __name__ == '__main__':
     show([c_map])
 
     # ** 测试自制diverging型cmap
-    diverging_cmap = create_diverging(["#4e00b3", "#0000FF", "#00c0ff",
-                                       "#a1d3ff", "#DCDCDC", "#FFD39B", "#FF8247", "#FF0000", "#FF5F9E"])
+    diverging_cmap = create_diverging(["#4e00b3", "#0000FF", "#00c0ff", "#a1d3ff", "#DCDCDC", "#FFD39B", "#FF8247", "#FF0000", "#FF5F9E"])
     show([diverging_cmap])
 
     # ** 测试根据RGB的txt文档制作色卡

{oafuncs-0.0.59 → oafuncs-0.0.61}/oafuncs/oa_data.py

@@ -4,8 +4,8 @@
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-09-17 17:12:47
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-10-06 19:05:38
-FilePath: \\Python\\My_Funcs\\OAFuncs\\OAFuncs\\oa_data.py
+LastEditTime: 2024-11-21 13:13:20
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_data.py
 Description:  
 EditPlatform: vscode
 ComputerInfo: XPS 15 9510
@@ -14,7 +14,6 @@ Python Version: 3.11
 '''
 
 
-
 import multiprocessing as mp
 from concurrent.futures import ThreadPoolExecutor
 
@@ -24,6 +23,8 @@ from scipy.interpolate import griddata
 __all__ = ['interp_2d', 'interp_2d_parallel']
 
 # ** 高维插值函数，插值最后两个维度
+
+
 def interp_2d(target_x, target_y, origin_x, origin_y, data, method='linear'):
     """
     高维插值函数，默认插值最后两个维度，传输数据前请确保数据的维度正确
@@ -51,8 +52,7 @@ def interp_2d(target_x, target_y, origin_x, origin_y, data, method='linear'):
 
     if origin_x.shape != dims[-2:] or origin_y.shape != dims[-2:]:
         print(origin_x.shape, dims[-2:])
-        raise ValueError(
-            'Shape of data does not match shape of origin_x or origin_y.')
+        raise ValueError('Shape of data does not match shape of origin_x or origin_y.')
 
     # 将目标网格展平成一维数组
     target_points = np.column_stack((np.ravel(target_y), np.ravel(target_x)))
@@ -62,14 +62,12 @@ def interp_2d(target_x, target_y, origin_x, origin_y, data, method='linear'):
 
     # 进行插值
     if len_dims == 2:
-        interpolated_data = griddata(origin_points, np.ravel(
-            data), target_points, method=method)
+        interpolated_data = griddata(origin_points, np.ravel(data), target_points, method=method)
         interpolated_data = np.reshape(interpolated_data, target_y.shape)
     elif len_dims == 3:
         interpolated_data = []
         for i in range(dims[0]):
-            dt = griddata(origin_points, np.ravel(
-                data[i, :, :]), target_points, method=method)
+            dt = griddata(origin_points, np.ravel(data[i, :, :]), target_points, method=method)
             interpolated_data.append(np.reshape(dt, target_y.shape))
             print(f'Interpolating {i+1}/{dims[0]}...')
         interpolated_data = np.array(interpolated_data)
@@ -78,11 +76,9 @@ def interp_2d(target_x, target_y, origin_x, origin_y, data, method='linear'):
         for i in range(dims[0]):
             interpolated_data.append([])
             for j in range(dims[1]):
-                dt = griddata(origin_points, np.ravel(
-                    data[i, j, :, :]), target_points, method=method)
+                dt = griddata(origin_points, np.ravel(data[i, j, :, :]), target_points, method=method)
                 interpolated_data[i].append(np.reshape(dt, target_y.shape))
-                print(
-                    f'\rInterpolating {i*dims[1]+j+1}/{dims[0]*dims[1]}...', end='')
+                print(f'\rInterpolating {i*dims[1]+j+1}/{dims[0]*dims[1]}...', end='')
         print('\n')
         interpolated_data = np.array(interpolated_data)
 
@@ -104,33 +100,24 @@ def interp_2d_parallel(target_x, target_y, origin_x, origin_y, data, method='lin
     example     : interpolated_data = interp_2d_parallel(target_x, target_y, origin_x, origin_y, data, method='linear')
     '''
     def interp_single2d(target_y, target_x, origin_y, origin_x, data, method='linear'):
-        target_points = np.column_stack(
-            (np.ravel(target_y), np.ravel(target_x)))
-        origin_points = np.column_stack(
-            (np.ravel(origin_y), np.ravel(origin_x)))
+        target_points = np.column_stack((np.ravel(target_y), np.ravel(target_x)))
+        origin_points = np.column_stack((np.ravel(origin_y), np.ravel(origin_x)))
 
-        dt = griddata(origin_points, np.ravel(
-            data[:, :]), target_points, method=method)
+        dt = griddata(origin_points, np.ravel(data[:, :]), target_points, method=method)
         return np.reshape(dt, target_y.shape)
 
     def interp_single3d(i, target_y, target_x, origin_y, origin_x, data, method='linear'):
-        target_points = np.column_stack(
-            (np.ravel(target_y), np.ravel(target_x)))
-        origin_points = np.column_stack(
-            (np.ravel(origin_y), np.ravel(origin_x)))
+        target_points = np.column_stack((np.ravel(target_y), np.ravel(target_x)))
+        origin_points = np.column_stack((np.ravel(origin_y), np.ravel(origin_x)))
 
-        dt = griddata(origin_points, np.ravel(
-            data[i, :, :]), target_points, method=method)
+        dt = griddata(origin_points, np.ravel(data[i, :, :]), target_points, method=method)
         return np.reshape(dt, target_y.shape)
 
     def interp_single4d(i, j, target_y, target_x, origin_y, origin_x, data, method='linear'):
-        target_points = np.column_stack(
-            (np.ravel(target_y), np.ravel(target_x)))
-        origin_points = np.column_stack(
-            (np.ravel(origin_y), np.ravel(origin_x)))
+        target_points = np.column_stack((np.ravel(target_y), np.ravel(target_x)))
+        origin_points = np.column_stack((np.ravel(origin_y), np.ravel(origin_x)))
 
-        dt = griddata(origin_points, np.ravel(
-            data[i, j, :, :]), target_points, method=method)
+        dt = griddata(origin_points, np.ravel(data[i, j, :, :]), target_points, method=method)
         return np.reshape(dt, target_y.shape)
 
     if len(target_y.shape) == 1:
@@ -150,16 +137,12 @@ def interp_2d_parallel(target_x, target_y, origin_x, origin_y, data, method='lin
     with ThreadPoolExecutor(max_workers=mp.cpu_count()-2) as executor:
         print(f'Using {mp.cpu_count()-2} threads...')
         if len_dims == 2:
-            interpolated_data = list(executor.map(interp_single2d, [target_y], [
-                                     target_x], [origin_y], [origin_x], [data], [method]))
+            interpolated_data = list(executor.map(interp_single2d, [target_y], [target_x], [origin_y], [origin_x], [data], [method]))
         elif len_dims == 3:
-            interpolated_data = list(executor.map(interp_single3d, [i for i in range(dims[0])], [
-                                     target_y]*dims[0], [target_x]*dims[0], [origin_y]*dims[0], [origin_x]*dims[0], [data]*dims[0], [method]*dims[0]))
+            interpolated_data = list(executor.map(interp_single3d, [i for i in range(dims[0])], [target_y]*dims[0], [target_x]*dims[0], [origin_y]*dims[0], [origin_x]*dims[0], [data]*dims[0], [method]*dims[0]))
         elif len_dims == 4:
-            interpolated_data = list(executor.map(interp_single4d, [i for i in range(dims[0]) for j in range(dims[1])], [j for i in range(dims[0]) for j in range(dims[1])], [
-                                     target_y]*dims[0]*dims[1], [target_x]*dims[0]*dims[1], [origin_y]*dims[0]*dims[1], [origin_x]*dims[0]*dims[1], [data]*dims[0]*dims[1], [method]*dims[0]*dims[1]))
-            interpolated_data = np.array(interpolated_data).reshape(
-                dims[0], dims[1], target_y.shape[0], target_x.shape[1])
+            interpolated_data = list(executor.map(interp_single4d, [i for i in range(dims[0]) for j in range(dims[1])], [j for i in range(dims[0]) for j in range(dims[1])], [target_y]*dims[0]*dims[1], [target_x]*dims[0]*dims[1], [origin_y]*dims[0]*dims[1], [origin_x]*dims[0]*dims[1], [data]*dims[0]*dims[1], [method]*dims[0]*dims[1]))
+            interpolated_data = np.array(interpolated_data).reshape(dims[0], dims[1], target_y.shape[0], target_x.shape[1])
 
     interpolated_data = np.array(interpolated_data)
 
@@ -193,8 +176,7 @@ if __name__ == '__main__':
 
     # 高维插值多线程
     start = time.time()
-    interpolated_data = interp_2d_parallel(
-        target_x, target_y, origin_x, origin_y, data)
+    interpolated_data = interp_2d_parallel(target_x, target_y, origin_x, origin_y, data)
     print(f'Interpolation time: {time.time()-start:.2f}s')
 
     print(interpolated_data.shape)