voxcity 0.6.1__py3-none-any.whl → 0.6.2__py3-none-any.whl

voxcity/geoprocessor/grid.py

@@ -147,56 +147,37 @@ def group_and_label_cells(array):
 
 def process_grid_optimized(grid_bi, dem_grid):
     """
-    Optimized version using numpy's bincount for fast averaging.
-    This is much faster than iterating through unique IDs.
+    Optimized version that computes per-building averages without allocating
+    huge arrays when building IDs are large and sparse.
     """
     result = dem_grid.copy()
-    
+
     # Only process if there are non-zero values
     if np.any(grid_bi != 0):
-        # Handle float IDs by converting to integers
-        # First check if we have float values
+        # Convert to integer IDs (handle NaN for float arrays)
         if grid_bi.dtype.kind == 'f':
-            # Convert to int, handling NaN values
             grid_bi_int = np.nan_to_num(grid_bi, nan=0).astype(np.int64)
         else:
             grid_bi_int = grid_bi.astype(np.int64)
-        
-        # Flatten arrays for processing
-        flat_bi = grid_bi_int.ravel()
+
+        # Work only on non-zero cells
+        flat_ids = grid_bi_int.ravel()
         flat_dem = dem_grid.ravel()
-        
-        # Filter out zero values
-        mask = flat_bi != 0
-        ids = flat_bi[mask]
-        values = flat_dem[mask]
-        
-        # Check if we have any valid IDs
-        if len(ids) > 0:
-            # Use bincount to sum values for each ID
-            sums = np.bincount(ids, weights=values)
-            counts = np.bincount(ids)
-            
-            # Avoid division by zero
+        nz_mask = flat_ids != 0
+        if np.any(nz_mask):
+            ids_nz = flat_ids[nz_mask]
+            vals_nz = flat_dem[nz_mask]
+
+            # Densify IDs via inverse indices to avoid np.bincount on large max(id)
+            unique_ids, inverse_idx = np.unique(ids_nz, return_inverse=True)
+            sums = np.bincount(inverse_idx, weights=vals_nz)
+            counts = np.bincount(inverse_idx)
             counts[counts == 0] = 1
-            
-            # Calculate means
             means = sums / counts
-            
-            # Apply means back to result
-            # Use the integer version for indexing
-            mask_nonzero = grid_bi_int != 0
-            # Ensure indices are within bounds
-            valid_ids = grid_bi_int[mask_nonzero]
-            valid_mask = valid_ids < len(means)
-            
-            # Apply only to valid indices
-            result_mask = np.zeros_like(mask_nonzero)
-            result_mask[mask_nonzero] = valid_mask
-            
-            # Set values
-            result[result_mask] = means[grid_bi_int[result_mask]]
-    
+
+            # Scatter means back to result for non-zero cells
+            result.ravel()[nz_mask] = means[inverse_idx]
+
     return result - np.min(result)
 
 def process_grid(grid_bi, dem_grid):

{voxcity-0.6.1.dist-info → voxcity-0.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: voxcity
-Version: 0.6.1
+Version: 0.6.2
 Summary: voxcity is an easy and one-stop tool to output 3d city models for microclimate simulation by integrating multiple geospatial open-data
 Author-email: Kunihiko Fujiwara <kunihiko@nus.edu.sg>
 Maintainer-email: Kunihiko Fujiwara <kunihiko@nus.edu.sg>

{voxcity-0.6.1.dist-info → voxcity-0.6.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 voxcity/__init__.py,sha256=el9v3gfybHOF_GUYPeSOqN0-vCrTW0eU1mcvi0sEfeU,252
-voxcity/generator.py,sha256=J61i6-bvgOlNQWgxlkSvOZ7CLAjRgh_XRYwslWkKxVM,55756
+voxcity/generator.py,sha256=9jZuhkcK0yJI347LETUDjd_SsxsMcvbx3DUF-uIyp98,54683
 voxcity/downloader/__init__.py,sha256=o_T_EU7hZLGyXxX9wVWn1x-OAa3ThGYdnpgB1_2v3AE,151
 voxcity/downloader/citygml.py,sha256=jVeHCLlJTf7k55OQGX0lZGQAngz_DD2V5TldSqRFlvc,36024
 voxcity/downloader/eubucco.py,sha256=ln1YNaaOgJfxNfCtVbYaMm775-bUvpAA_LDv60_i22w,17875
@@ -16,7 +16,7 @@ voxcity/exporter/magicavoxel.py,sha256=SfGEgTZRlossKx3Xrv9d3iKSX-HmfQJEL9lZHgWMD
 voxcity/exporter/obj.py,sha256=h1_aInpemcsu96fSTwjKMqX2VZAFYbZbElWd4M1ogyI,27973
 voxcity/geoprocessor/__init__.py,sha256=JzPVhhttxBWvaZ0IGX2w7OWL5bCo_TIvpHefWeNXruA,133
 voxcity/geoprocessor/draw.py,sha256=avXQwbGQWG3ZPPI8mwy0YN0K_aG4NMBdXI0vDg7yad0,35837
-voxcity/geoprocessor/grid.py,sha256=uIfEE-2rfT274QKN9qnyXu3E2nCwaUHiuxHra2iclZM,71186
+voxcity/geoprocessor/grid.py,sha256=wrlOsX8cD0W5xCnOS5IOHy8DNqDGTM1I2270eVs787c,70602
 voxcity/geoprocessor/mesh.py,sha256=-r_3EGL3PZr-QngMOXrwKllYA4o0moDj0-bZvU0mlOo,31237
 voxcity/geoprocessor/network.py,sha256=YynqR0nq_NUra_cQ3Z_56KxfRia1b6-hIzGCj3QT-wE,25137
 voxcity/geoprocessor/polygon.py,sha256=DfzXf6R-qoWXEZv1z1aHCVfr-DCuCFw6lieQT5cNHPA,61188
@@ -30,9 +30,9 @@ voxcity/utils/lc.py,sha256=722Gz3lPbgAp0mmTZ-g-QKBbAnbxrcgaYwb1sa7q8Sk,16189
 voxcity/utils/material.py,sha256=H8K8Lq4wBL6dQtgj7esUW2U6wLCOTeOtelkTDJoRgMo,10007
 voxcity/utils/visualization.py,sha256=Hk31pVOZ3q8K0QaudAMSqKUquF1Hd1Hug8626D4JJ74,115143
 voxcity/utils/weather.py,sha256=2Jtg-rIVJcsTtiKE-KuDnhIqS1-MSS16_zFRzj6zmu4,36435
-voxcity-0.6.1.dist-info/licenses/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
-voxcity-0.6.1.dist-info/licenses/LICENSE,sha256=s_jE1Df1nTPL4A_5GCGic5Zwex0CVaPKcAmSilxJPPE,1089
-voxcity-0.6.1.dist-info/METADATA,sha256=xjpQvvglGgYo63uNuUKkdupRRAZs9so-8GWFDPh6N-c,26723
-voxcity-0.6.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-voxcity-0.6.1.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
-voxcity-0.6.1.dist-info/RECORD,,
+voxcity-0.6.2.dist-info/licenses/AUTHORS.rst,sha256=m82vkI5QokEGdcHof2OxK39lf81w1P58kG9ZNNAKS9U,175
+voxcity-0.6.2.dist-info/licenses/LICENSE,sha256=s_jE1Df1nTPL4A_5GCGic5Zwex0CVaPKcAmSilxJPPE,1089
+voxcity-0.6.2.dist-info/METADATA,sha256=zbCezoMlL37h_huSEIOhhIa9ax4rlgsJVgeZHhUTQAI,26723
+voxcity-0.6.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+voxcity-0.6.2.dist-info/top_level.txt,sha256=00b2U-LKfDllt6RL1R33MXie5MvxzUFye0NGD96t_8I,8
+voxcity-0.6.2.dist-info/RECORD,,