shancx 1.9.33.176__py3-none-any.whl → 1.9.33.178__py3-none-any.whl

shancx/QC.py

@@ -1,5 +1,6 @@
 import cv2
 import numpy as np
+from numba import jit
 def removeSmallPatches(binary_mask, min_pixels=50, min_area=40):
     binary_mask = (binary_mask > 0).astype(np.uint8)
     num_labels, labels, stats, centroids = cv2.connectedComponentsWithStats(
@@ -66,4 +67,157 @@ mask = removeSmallPatches(b, min_pixels=50, min_area=40)
 data = np.where(mask, data, 0)
 filtered_data = np.full([256,256],0)
 filtered_data[mask] = e[mask]
+"""
+
+import cv2
+import numpy as np
+from numba import jit, prange
+from concurrent.futures import ThreadPoolExecutor
+def removeSmallPatches_optimized(binary_mask, min_pixels=50, min_area=40):
+    binary_mask = (binary_mask > 0).astype(np.uint8)
+    num_labels, labels, stats, _ = cv2.connectedComponentsWithStats(binary_mask, connectivity=8)
+    output_mask = np.zeros_like(binary_mask)
+    valid_labels = [i for i in range(1, num_labels) if stats[i, cv2.CC_STAT_AREA] >= min_pixels]
+    for i in valid_labels:
+        contour_mask = (labels == i).astype(np.uint8)
+        contours, _ = cv2.findContours(contour_mask, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)
+        
+        if contours and cv2.contourArea(contours[0]) >= min_area:
+            output_mask[labels == i] = 255
+    
+    return output_mask
+
+@jit(nopython=True, parallel=True, nogil=True)
+def numba_filter_components(labels, stats, min_pixels, min_area):
+    height, width = labels.shape
+    output = np.zeros((height, width), dtype=np.uint8)
+    for i in prange(1, stats.shape[0]):
+        if stats[i, 4] >= min_pixels:  # stats[i, 4] 对应 cv2.CC_STAT_AREA
+            for y in range(height):
+                for x in range(width):
+                    if labels[y, x] == i:
+                        output[y, x] = 255    
+    return output
+def removeSmallPatches_numba(binary_mask, min_pixels=50, min_area=40):
+    binary_mask = (binary_mask > 0).astype(np.uint8)
+    num_labels, labels, stats, _ = cv2.connectedComponentsWithStats(binary_mask, connectivity=8)
+    output_mask = numba_filter_components(labels, stats, min_pixels, min_area)
+    if min_area > 0:
+        num_labels2, labels2, stats2, _ = cv2.connectedComponentsWithStats(output_mask, connectivity=8)
+        final_output = np.zeros_like(output_mask)        
+        for i in range(1, num_labels2):
+            contour_mask = (labels2 == i).astype(np.uint8)
+            contours, _ = cv2.findContours(contour_mask, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)            
+            if contours and cv2.contourArea(contours[0]) >= min_area:
+                final_output[labels2 == i] = 255        
+        return final_output    
+    return output_mask
+def process_block_optimized_v2(args):
+    block, coords, min_pixels, min_area = args
+    num_labels, labels, stats, _ = cv2.connectedComponentsWithStats(block, connectivity=8)
+    result = np.zeros_like(block)
+    valid_labels = []
+    for i in range(1, num_labels):
+        if stats[i, cv2.CC_STAT_AREA] >= min_pixels:
+            valid_labels.append(i)
+    for i in valid_labels:
+        component_indices = (labels == i)
+        if component_indices.any():
+            component_mask = component_indices.astype(np.uint8)
+            contours, _ = cv2.findContours(component_mask, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_SIMPLE)            
+            if contours and cv2.contourArea(contours[0]) >= min_area:
+                result[component_indices] = 255    
+    return result, coords
+def removeSmallPatches_fast_v2(binary_mask, min_pixels=100, min_area=40, num_workers=4):
+    binary_mask = (binary_mask > 0).astype(np.uint8)
+    h, w = binary_mask.shape
+    optimal_block_size = max(500, min(2000, (h * w) // (num_workers * 10000)))    
+    output = np.zeros_like(binary_mask)
+    blocks = []
+    for y in range(0, h, optimal_block_size):
+        for x in range(0, w, optimal_block_size):
+            y_end, x_end = min(y + optimal_block_size, h), min(x + optimal_block_size, w)
+            block = binary_mask[y:y_end, x:x_end].copy() 
+            blocks.append((block, (y, x, y_end, x_end), min_pixels, min_area))    
+    actual_workers = min(num_workers, len(blocks))    
+    with ThreadPoolExecutor(max_workers=actual_workers) as executor:
+        for result, (y, x, y_end, x_end) in executor.map(process_block_optimized_v2, blocks):
+            output[y:y_end, x:x_end] = result    
+    return output
+def get_optimal_function(binary_mask, min_pixels=50, min_area=40):
+    h, w = binary_mask.shape
+    total_pixels = h * w    
+    if total_pixels < 1000000:  # 小于100万像素
+        return removeSmallPatches_optimized    
+    if min_area <= 0:
+        return removeSmallPatches_numba    
+    return removeSmallPatches_fast_v2
+def auto_remove_small_patches(binary_mask, min_pixels=50, min_area=40):
+    optimal_func = get_optimal_function(binary_mask, min_pixels, min_area)
+    return optimal_func(binary_mask, min_pixels, min_area)
+""" 
+try:
+    result = auto_remove_small_patches(binary_mask, min_pixels=50, min_area=40)
+except Exception as e:
+    from original_module import removeSmallPatches
+    result = removeSmallPatches(binary_mask, min_pixels=50, min_area=40)
+ removeSmallPatches_numba optimum performance min_area <= 0
+ removeSmallPatches_fast_v2 area
+"""
+@jit(nopython=True, parallel=True, nogil=True)
+def QC_simple_numba(mat, dbzTH = 10.0, areaTH=20):
+    # Create a copy of the matrix
+    mat1 = np.copy(mat)
+    rows, cols = mat1.shape
+    
+    # Create binary mask based on threshold
+    mask = np.zeros((rows, cols), dtype=np.uint8)
+    for i in range(rows):
+        for j in range(cols):
+            if mat1[i, j] > dbzTH:
+                mask[i, j] = 1    
+    # Simple 8-connectivity region labeling (flood fill algorithm)
+    labels = np.zeros((rows, cols), dtype=np.int32)
+    current_label = 1
+    region_areas = []    
+    for i in range(rows):
+        for j in range(cols):
+            # If current pixel is foreground and not yet labeled
+            if mask[i, j] == 1 and labels[i, j] == 0:
+                # Start flood fill
+                stack = [(i, j)]
+                labels[i, j] = current_label
+                area = 0
+                
+                while stack:
+                    x, y = stack.pop()
+                    area += 1
+                    
+                    # Check 8 surrounding pixels
+                    for dx in [-1, 0, 1]:
+                        for dy in [-1, 0, 1]:
+                            nx, ny = x + dx, y + dy
+                            # Check bounds and conditions
+                            if (0 <= nx < rows and 0 <= ny < cols and 
+                                mask[nx, ny] == 1 and labels[nx, ny] == 0):
+                                labels[nx, ny] = current_label
+                                stack.append((nx, ny))
+                
+                region_areas.append(area)
+                current_label += 1
+    
+    # Apply area threshold filtering
+    for i in range(rows):
+        for j in range(cols):
+            if labels[i, j] > 0 and region_areas[labels[i, j] - 1] < areaTH:
+                mat1[i, j] = 0    
+    return mat1
+def QC_ref_numba(mat, dbzTH = 10, areaTH=20):
+    for i in range(len(mat)):      
+        mat[i] = QC_simple_numba(mat[i], dbzTH, areaTH)
+    return mat 
+"""
+CR = subset["CR"].data[0].copy()
+CR[CR < 6] = 0
+CR = QC_ref_numba(CR[None], areaTH=15)[0]
 """

shancx/geosProj.py

@@ -58,7 +58,7 @@ class goesProjMSG10():
         self.CFAC=FAC[resolution]
         self.LFAC=FAC[resolution]
 
-    def transform(self,latD,lonDe,ROC=5,ROL=-30):
+    def transform(self,latD,lonDe,ROC=-10,ROL=-30):
         lat=np.radians(latD)
         lon=np.radians(lonDe)
         ba2=np.square(self.eb/self.ea)

{shancx-1.9.33.176.dist-info → shancx-1.9.33.178.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shancx
-Version: 1.9.33.176
+Version: 1.9.33.178
 Summary: A simple timer decorator
 Home-page: https://gitee.com/shancx
 Author: shancx

{shancx-1.9.33.176.dist-info → shancx-1.9.33.178.dist-info}/RECORD

@@ -3,7 +3,7 @@ shancx/Inst.py,sha256=Q8dULK2djqBU0JFyhMAf1mhWzFDwx9SaAJuTIO0AWig,751
 shancx/Lib.py,sha256=GUAspllSxk39mvj-F1Q8Ys0EcY_lQfZPRGPE7L3x4SE,977
 shancx/Path1.py,sha256=vX4A5RgdwVyIVVNZRocl18rOu1Z8YMLfDb0B92-0bE8,5334
 shancx/Point.py,sha256=gyIomOVbNoz6SOcAhhTS26NHBeJ0TOwB-ljNsBWN1ZE,1909
-shancx/QC.py,sha256=gVH1jAZ2tI-sDygozwfXQgLEJNJscFuzxexWXuXHWHw,2803
+shancx/QC.py,sha256=MFxbPMEwrnk5l0sTFMrx13wPlXJ5WI5TovzaiBoEr0E,9848
 shancx/Read.py,sha256=xX4ciDoWhL9KAsN3cWvaFAOMlSVwR56AR3dSB-SBnLI,3139
 shancx/ZR.py,sha256=5APchqVoI1G2MkrN9YJSWCwfLUygcSFIsUXSo9aq1Qg,341
 shancx/__init__.py,sha256=2SJt6zlJTlXt_b81qnQOg2DAhRUnLW8DXdu2qjIa1hM,19766
@@ -11,7 +11,7 @@ shancx/args.py,sha256=Nr80vgQpT3m31_crKGf5DvofCxyERJFbqJ1sHb1BIqs,1042
 shancx/bak.py,sha256=eKe2o1Yq7LCldoA-LXi14s_QNf1BkQsDsWJ7pDoscrw,25428
 shancx/cmp.py,sha256=cIQv-QTl-22FJa6tmHyBu_IQmMq5LnsQGGFK5jc5hMA,893
 shancx/df2database.py,sha256=h9_n9tZBWKyGKnpGPRHPSZgMn5kylX0sV5APwmi2SHM,3315
-shancx/geosProj.py,sha256=rYhhbB0WTaVJCT4F8k9HWLA75RPXpGrOXoTzISXnyB8,2683
+shancx/geosProj.py,sha256=JMmtj3kV8rtFkKbmwvTKuDWlC8AkgLG8JvCPzkn8Dfs,2685
 shancx/getResponse.py,sha256=QmJfa4czGCOiKb8RuCLXKE7AAKVADAptNiwn7v1tfbM,1055
 shancx/info.py,sha256=0rk_L8Z5uj9RliaZrzT-CArH9ZObmdmcp-1RxAItL08,1122
 shancx/netdfJU.py,sha256=96KR9NMLr2Kcs_OOMpX7QPujdWUj0GCEUIZ7_4_pBxw,7741
@@ -84,7 +84,7 @@ shancx/Train/multiGpu.py,sha256=D_oZeiSc7VWktpnVDwrFOC1CYZSt9rxOKY5lngE5vFg,820
 shancx/Train/prepare.py,sha256=vL_8UOA66oZCBIwCICtihsGibivtNgaVJGulJxfNdn8,6793
 shancx/Train/renet50.py,sha256=wEhYk1X96WE5zuqHqVxWLJa-A5jDNkz4z6edORNufnA,6428
 shancx/tensBoard/__init__.py,sha256=ga2C5YyJITvvQA1ocpxna_KNFnNRJVwkTjLoIglLZUQ,993
-shancx-1.9.33.176.dist-info/METADATA,sha256=Or9YgSEux7QjyEpyGmijyRrgRUiNBUnemJYxZPRPzus,644
-shancx-1.9.33.176.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-shancx-1.9.33.176.dist-info/top_level.txt,sha256=akfCS1vKWz3pNmEN_yN9ZiGp-60IQY5ET38mRx_i_-4,7
-shancx-1.9.33.176.dist-info/RECORD,,
+shancx-1.9.33.178.dist-info/METADATA,sha256=V0mQKvomKiJ8EGg9GVYK_nSlUD2a_vb5YFkmAFsxXa4,644
+shancx-1.9.33.178.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+shancx-1.9.33.178.dist-info/top_level.txt,sha256=akfCS1vKWz3pNmEN_yN9ZiGp-60IQY5ET38mRx_i_-4,7
+shancx-1.9.33.178.dist-info/RECORD,,