oafuncs 0.0.98.16__py3-none-any.whl → 0.0.98.17__py3-none-any.whl

oafuncs/_script/data_interp.py

@@ -2,51 +2,88 @@ import importlib.util
 from typing import List, Union
 
 import numpy as np
-from oafuncs.oa_tool import PEx
 from scipy.interpolate import griddata
 
+from oafuncs.oa_tool import PEx
+
+# 检查 pykdtree 是否可用
 _has_pykdtree = importlib.util.find_spec("pykdtree.kdtree") is not None
 
 
-def _fill_nan_nearest(arr):
-    """用最近邻插值填充 NaN，优先用pykdtree加速"""
+def _fill_nan_nearest(arr: np.ndarray) -> np.ndarray:
+    """
+    用最近邻填充 NaN（只支持2D数组）
+    """
+    # 基础检查：如果输入为None，直接返回None
+    if arr is None:
+        return None
+
+    # 确保是2D ndarray
+    arr = np.asarray(arr)
+    if arr.ndim != 2:
+        raise ValueError(f"_fill_nan_nearest 只支持2D数组，但输入的维度是 {arr.ndim}")
+
+    # 保存原始dtype并转为float
+    orig_dtype = arr.dtype
+    arr = arr.astype(float, copy=True)  # 使用copy=True确保不修改原数据
+
+    # 检查是否有NaN需要填充
     mask = np.isnan(arr)
     if not mask.any():
-        return arr
-    if _has_pykdtree:
-        from pykdtree.kdtree import KDTree
-
-        valid_idx = np.array(np.where(~mask)).T
-        nan_idx = np.array(np.where(mask)).T
-        if len(valid_idx) == 0:
-            # 全是nan，直接返回
-            return arr
-        tree = KDTree(valid_idx)
-        dist, idx = tree.query(nan_idx, k=1)
-        filled = arr.copy()
-        # idx shape: (n_nan, 1)，valid_idx shape: (n_valid, ndim)
-        # valid_idx[idx].T shape: (ndim, n_nan)
-        filled[tuple(nan_idx.T)] = arr[tuple(valid_idx[idx.flatten()].T)]
-        return filled
-    else:
-        from scipy.ndimage import distance_transform_edt
-
-        idx = distance_transform_edt(mask, return_distances=False, return_indices=True)
-        return arr[tuple(idx)]
-
-
-def _data_clip(data, data_min, data_max):
+        return arr.copy()
+
+    try:
+        valid = np.array(np.where(~mask)).T
+        invalid = np.array(np.where(mask)).T
+
+        # 如果有效点为空，直接返回原数据
+        if valid.shape[0] == 0:
+            return arr.copy()
+
+        # 使用KDTree进行最近邻填充
+        if _has_pykdtree:
+            from pykdtree.kdtree import KDTree
+
+            tree = KDTree(valid)
+            _, idx = tree.query(invalid, k=1)
+            filled = arr.copy()
+            filled[tuple(invalid.T)] = arr[tuple(valid[idx.flatten()].T)]
+        else:
+            # 备用方法：使用scipy的distance_transform_edt
+            from scipy.ndimage import distance_transform_edt
+
+            idx = distance_transform_edt(mask, return_distances=False, return_indices=True)
+            filled = arr[tuple(idx)]
+
+        return filled.astype(orig_dtype)
+    except Exception as e:
+        import warnings
+
+        warnings.warn(f"Error in _fill_nan_nearest: {e}, shape={arr.shape}")
+        return arr.copy()  # 发生异常返回原始数据
+
+
+def _data_clip(data: np.ndarray, data_min, data_max) -> np.ndarray:
     """
-    对data进行范围裁剪，超出范围的点设为nan，并用fill_nan_nearest填充，最后再次填充极端nan。
+    将数据裁剪至 [data_min, data_max]，超出或 NaN 用最近邻填补。
+    支持 1~4D。
     """
-    arr = np.asarray(data)
+    arr = np.array(data, copy=True)  # 使用副本避免修改原数据
+    ndims = arr.ndim
+    if ndims != 2:
+        raise ValueError(f"_data_clip 只支持1~4维数组，但输入的维度是 {ndims}")
+    dtype = arr.dtype
+
+    # 检查是否需要裁剪
     mask = np.isnan(arr) | (arr < data_min) | (arr > data_max)
-    if np.any(mask):
-        arr = np.where(mask, np.nan, arr)
-        arr = _fill_nan_nearest(arr)
-    if np.any(np.isnan(arr)):
-        arr = _fill_nan_nearest(arr)
-    return arr
+    if not np.any(mask):
+        return arr.astype(dtype)
+
+    # 将超出范围的值设为NaN
+    arr[mask] = np.nan
+
+    return _fill_nan_nearest(arr).astype(dtype)
+
 
 
 def _interp_single_worker(*args):

oafuncs/_script/data_interp_geo.py

@@ -1,54 +1,11 @@
-#!/usr/bin/env python
-# coding=utf-8
-"""
-Author: Liu Kun && 16031215@qq.com
-Date: 2025-04-26 11:54:21
-LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2025-04-26 11:54:22
-FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\_script\\data_interp_geo.py
-Description:
-EditPlatform: vscode
-ComputerInfo: XPS 15 9510
-SystemInfo: Windows 11
-Python Version: 3.12
-"""
-
-import importlib.util
 from typing import List, Union
 
 import numpy as np
 from scipy.interpolate import RectBivariateSpline
 
 from oafuncs.oa_tool import PEx
-
-_has_pykdtree = importlib.util.find_spec("pykdtree.kdtree") is not None
-
-
-def fill_nan_nearest(arr):
-    """用最近邻插值填充 NaN，优先用pykdtree加速"""
-    mask = np.isnan(arr)
-    if not mask.any():
-        return arr
-    if _has_pykdtree:
-        from pykdtree.kdtree import KDTree
-
-        valid_idx = np.array(np.where(~mask)).T
-        nan_idx = np.array(np.where(mask)).T
-        if len(valid_idx) == 0:
-            # 全是nan，直接返回
-            return arr
-        tree = KDTree(valid_idx)
-        dist, idx = tree.query(nan_idx, k=1)
-        filled = arr.copy()
-        # idx shape: (n_nan, 1)，valid_idx shape: (n_valid, ndim)
-        # valid_idx[idx].T shape: (ndim, n_nan)
-        filled[tuple(nan_idx.T)] = arr[tuple(valid_idx[idx.flatten()].T)]
-        return filled
-    else:
-        from scipy.ndimage import distance_transform_edt
-
-        idx = distance_transform_edt(mask, return_distances=False, return_indices=True)
-        return arr[tuple(idx)]
+from oafuncs.oa_data import data_clip
+from oafuncs._script.data_interp import _fill_nan_nearest
 
 
 def _interp_single_worker(*args):
@@ -63,7 +20,7 @@ def _interp_single_worker(*args):
     if np.isnan(data_slice).any():
         mask = np.isnan(data_slice)
         if mask.any():
-            data_slice = fill_nan_nearest(data_slice)
+            data_slice = _fill_nan_nearest(data_slice)
     x1d = np.unique(sx[0, :])
     y1d = np.unique(sy[:, 0])
     if sx.shape != (len(y1d), len(x1d)) or sy.shape != (len(y1d), len(x1d)):
@@ -80,13 +37,7 @@ def _interp_single_worker(*args):
     out = interp_func(ty[:, 0], tx[0, :])
     # 优化裁剪逻辑：超出范围的点设为nan，再用fill_nan_nearest填充
     arr = np.asarray(out)
-    mask = np.isnan(arr) | (arr < data_min) | (arr > data_max)
-    if np.any(mask):
-        arr = np.where(mask, np.nan, arr)
-        arr = fill_nan_nearest(arr)
-    # 最后再填充nan（极端情况）
-    if np.any(np.isnan(arr)):
-        arr = fill_nan_nearest(arr)
+    arr = data_clip(arr,data_min,data_max)
     return arr
 
 

{oafuncs-0.0.98.16.dist-info → oafuncs-0.0.98.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oafuncs
-Version: 0.0.98.16
+Version: 0.0.98.17
 Summary: Oceanic and Atmospheric Functions
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu

{oafuncs-0.0.98.16.dist-info → oafuncs-0.0.98.17.dist-info}/RECORD

@@ -11,8 +11,8 @@ oafuncs/oa_tool.py,sha256=rpPkLqWhqMmqlCc5wjL8qMTg3gThCkSrYJckbX_0iJc,8631
 oafuncs/_data/hycom.png,sha256=MadKs6Gyj5n9-TOu7L4atQfTXtF9dvN9w-tdU9IfygI,10945710
 oafuncs/_data/oafuncs.png,sha256=o3VD7wm-kwDea5E98JqxXl04_78cBX7VcdUt7uQXGiU,3679898
 oafuncs/_script/cprogressbar.py,sha256=UIgGcLFs-6IgWlITuBLaQqrpt4OAK3Mst5RlCiNfZdQ,15772
-oafuncs/_script/data_interp.py,sha256=W4kYZmkZxWJqKfZVdQOd8jUv0y11t6k8tsukRQt670I,6373
-oafuncs/_script/data_interp_geo.py,sha256=Fv-l8MeKhx6e7UVtzk2b6Pb2Cfcg-RNnMFmkcd0ng64,5296
+oafuncs/_script/data_interp.py,sha256=_k8EMSiFxutrqEVTLsL4mEPE6ssYq8bzmBlksCZ9nAE,7428
+oafuncs/_script/data_interp_geo.py,sha256=X89KxLYhpltWi0Sf96gIhBL3r1M5aExd_JCmgBmmvUc,3742
 oafuncs/_script/email.py,sha256=lL4HGKrr524-g0xLlgs-4u7x4-u7DtgNoD9AL8XJKj4,3058
 oafuncs/_script/netcdf_merge.py,sha256=9hCyxfeUHnBzs50_0v0jzVfxpMxTX4dNTo0pmsp_T6g,4226
 oafuncs/_script/netcdf_modify.py,sha256=sGRUYNhfGgf9JV70rnBzw3bzuTRSXzBTL_RMDnDPeLQ,4552
@@ -39,8 +39,8 @@ oafuncs/oa_sign/__init__.py,sha256=QKqTFrJDFK40C5uvk48GlRRbGFzO40rgkYwu6dYxatM,5
 oafuncs/oa_sign/meteorological.py,sha256=8091SHo2L8kl4dCFmmSH5NGVHDku5i5lSiLEG5DLnOQ,6489
 oafuncs/oa_sign/ocean.py,sha256=xrW-rWD7xBWsB5PuCyEwQ1Q_RDKq2KCLz-LOONHgldU,5932
 oafuncs/oa_sign/scientific.py,sha256=a4JxOBgm9vzNZKpJ_GQIQf7cokkraV5nh23HGbmTYKw,5064
-oafuncs-0.0.98.16.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.98.16.dist-info/METADATA,sha256=yPzl7v8ASdNRSjiXasAGuxPKA9rM_zCIQBQHfmz4I0k,4273
-oafuncs-0.0.98.16.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-oafuncs-0.0.98.16.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.98.16.dist-info/RECORD,,
+oafuncs-0.0.98.17.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.98.17.dist-info/METADATA,sha256=8-0Gp7bgVD7qR4sfSQtKmoCl5yV8f7YBnEROZV28oJY,4273
+oafuncs-0.0.98.17.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+oafuncs-0.0.98.17.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.98.17.dist-info/RECORD,,