wolfhece 2.2.3__py3-none-any.whl → 2.2.5__py3-none-any.whl

wolfhece/wolf_array.py

@@ -8,6 +8,13 @@ This script and its content are protected by copyright law. Unauthorized
 copying or distribution of this file, via any medium, is strictly prohibited.
 """
 
+try:
+    from osgeo import gdal, osr
+    gdal.UseExceptions()
+except ImportError as e:
+    print(e)
+    raise Exception(_('Error importing GDAL library'))
+
 import os
 import sys
 
@@ -127,13 +134,6 @@ VERSION_RGB = 3
 
 from numba import jit
 
-try:
-    from osgeo import gdal, osr
-    gdal.UseExceptions()
-except ImportError as e:
-    print(e)
-    raise Exception(_('Error importing GDAL library'))
-
 @jit(nopython=True)
 def custom_gradient(array: np.ndarray):
     """ Calculate the gradient manually """
@@ -5495,10 +5495,10 @@ class WolfArray(Element_To_Draw, header_wolf):
         return self.alpha
 
     # def find_minmax(self, update=False):
-        
+
     #     if update:
     #         [self.xmin, self.xmax], [self.ymin, self.ymax] = self.get_bounds()
-    
+
     @property
     def memory_usage(self):
         """
@@ -8568,6 +8568,40 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         return self.get_values_underpoly(myvect, usemask, getxy)
 
+    def count_unique_pixels(self) -> dict[int, int]:
+        """
+        Count the number of pixels for each unique value in the array
+        :return: dictionary with the code as key and the number of pixels as value
+        """
+        if self.wolftype not in [WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_FULL_INTEGER8, WOLF_ARRAY_FULL_UINTEGER8]:
+            logging.error("Bad wolftype")
+            return {}
+
+        counts = np.bincount(self.array[~self.array.mask].ravel())
+        ret = {i: int(val) for i, val in enumerate(counts) if val > 0}
+
+        return ret
+
+    def get_unique_areas(self, format:Literal['m2', 'ha', 'km2'] = 'm2') -> dict[int, float]:
+        """
+        Get the areas of each code in the array
+        :param array: numpy array or WolfArray
+        :return: dictionary with the code as key and the area in m² as value
+        """
+        ret = self.count_unique_pixels()
+
+        fact = 1.0
+        if format in ['ha', 'Ha']:
+            fact = 0.0001
+        elif format in ['km2', 'km²']:
+            fact = 1e-6
+        elif format not in ['m2', 'm²']:
+            logging.error("Bad format")
+            return {}
+
+        # Convert counts to areas in m²
+        return {code: float(count) * self.dx * self.dy * fact for code, count in ret.items()}
+
     def count_insidepoly(self, myvect: vector,
                          usemask:bool=True,
                          method:Literal['mpl', 'shapely_strict', 'shapely_wboundary', 'rasterio']='shapely_strict',
@@ -9427,6 +9461,59 @@ class WolfArray(Element_To_Draw, header_wolf):
         y, x = np.meshgrid(y_discr, x_discr)
         return x, y
 
+    def convolve(self,
+                 filter,
+                 method:Literal['scipyfft',
+                                'jaxfft',
+                                'classic']='scipyfft',
+                 inplace:bool=True) -> "WolfArray":
+        """
+        Convolve the array with a filter
+
+        :param filter: filter to convolve with
+        :param method: method to use for convolution ('scipyfft', 'jaxfft', 'classic')
+        :param inplace: if True, the array is modified in place, otherwise a new array is returned
+        :return: convolved array, WolfArray instance
+
+        """
+
+        if isinstance(filter, WolfArray):
+            _filter = filter.array.data.copy()
+            _filter[filter.array.mask] = 0.0
+        elif isinstance(filter, np.ndarray):
+            _filter = filter.copy()
+            _filter[np.isnan(_filter)] = 0.0
+        else:
+            logging.error("Filter must be a WolfArray or a numpy array")
+            return None
+
+        if method == 'classic':
+            from scipy.signal import convolve2d
+            convolved = convolve2d(self.array.data, _filter, mode='same', fillvalue=0.0)
+        elif method == 'scipyfft':
+            from scipy.signal import fftconvolve
+            convolved = fftconvolve(self.array.data, _filter, mode='same')
+        elif method == 'jaxfft':
+            import jax.numpy as jnp
+            from jax.scipy.signal import fftconvolve as jax_fftconvolve
+            jax_filter = jnp.array(_filter)
+            jax_array = jnp.array(self.array.data)
+            convolved = jax_fftconvolve(jax_array, jax_filter, mode='same')
+            convolved = jnp.asarray(convolved)
+        else:
+            logging.error("Method not supported")
+            return None
+
+        if inplace:
+            self.array.data[:,:] = convolved
+            return self
+        else:
+            newWolfArray = WolfArray(mold=self)
+            newWolfArray.array.data[:,:] = convolved
+            newWolfArray.array.mask[:,:] = self.array.mask[:,:]
+            newWolfArray.count()
+            return newWolfArray
+
     def crop_masked_at_edges(self):
 
         """
@@ -9933,11 +10020,26 @@ class WolfArray(Element_To_Draw, header_wolf):
                 logging.error(e)
 
         if (vmin is None) and (vmax is None):
-            im = ax.imshow(self.array.transpose(), origin='lower', cmap=self.mypal,
-                    extent=(self.origx, self.origx + self.dx * self.nbx, self.origy, self.origy + self.dy * self.nby))
-        else:
-            im = ax.imshow(self.array.transpose(), origin='lower', cmap=self.mypal,
-                    extent=(self.origx, self.origx + self.dx * self.nbx, self.origy, self.origy + self.dy * self.nby), vmin=vmin, vmax=vmax)
+            # im = ax.imshow(self.array.transpose(), origin='lower', cmap=self.mypal,
+            #         extent=(self.origx, self.origx + self.dx * self.nbx, self.origy, self.origy + self.dy * self.nby))
+            im = ax.imshow(self.array.transpose(),
+                           origin='lower',
+                           norm = self.mypal.norm,
+                           cmap=self.mypal.cmap,
+                           interpolation='none',
+                           extent=(self.origx,
+                                   self.origx + self.dx * self.nbx,
+                                   self.origy,
+                                   self.origy + self.dy * self.nby))
+        else:
+            im = ax.imshow(self.array.transpose(),
+                           origin='lower',
+                           cmap=self.mypal,
+                           extent=(self.origx,
+                                   self.origx + self.dx * self.nbx,
+                                   self.origy,
+                                   self.origy + self.dy * self.nby),
+                           vmin=vmin, vmax=vmax)
         ax.set_aspect('equal')
 
         if getdata_im:

{wolfhece-2.2.3.dist-info → wolfhece-2.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.3
+Version: 2.2.5
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece

{wolfhece-2.2.3.dist-info → wolfhece-2.2.5.dist-info}/RECORD

@@ -8,17 +8,17 @@ wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
 wolfhece/PandasGrid.py,sha256=YIleVkUkoP2MjtQBZ9Xgwk61zbgMj4Pmjj-clVTfPRs,2353
 wolfhece/PyConfig.py,sha256=Y0wtSIFpAMYa7IByh7hbW-WEOVjNsQEduq7vhIYdZQw,16716
 wolfhece/PyCrosssections.py,sha256=igU_ELrg5VrHU6RNbF5tHxPyVImpR3xdpfopJYc7haw,114711
-wolfhece/PyDraw.py,sha256=GVwGT4mG0XnIq9fV5Vvg1jeMMSv6609TAi_OkSj4gGo,629784
+wolfhece/PyDraw.py,sha256=mCIcXgtTT3vvixO_bvo76HlgK9p1MKk1GljGGIuIosw,631732
 wolfhece/PyGui.py,sha256=IU97wVlmer3Q2MpWbJv4MQWH7nYbc5uN4pRzhr4jdlM,145197
 wolfhece/PyGuiHydrology.py,sha256=sKafpOopBg50L5llZCI_fZtbebVTDtxvoRI6-osUwhg,14745
 wolfhece/PyHydrographs.py,sha256=1P5XAURNqCvtSsMQXhOn1ihjTpr725sRsZdlCEhhk6M,3730
-wolfhece/PyPalette.py,sha256=SnzMfzpVblbvq1kItLp52jufk6-R1b0QX3fF6RUKKT4,34842
+wolfhece/PyPalette.py,sha256=k9b_95GYD0USQ8DS5zGXeZ577712U6772kmhEbJtlXw,35406
 wolfhece/PyParams.py,sha256=Dh9C_WYICMjo3m9roRySsu8ZgFzzYhSr6RpbaXZni0M,99423
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
-wolfhece/PyVertex.py,sha256=PDKpLFPqE1ORzfi36xKIjuKsxR8DR0iNMsLhAGw11rY,45205
+wolfhece/PyVertex.py,sha256=Ym42pHWwEVv6Fu5v-OzhlHiQB46DnvLf9MUe_c3lbR0,45610
 wolfhece/PyVertexvectors.py,sha256=0lt0YyHIz_IxgXqdqPlTDruDwjeP6L1Dw6B2Q35a8kQ,325801
-wolfhece/PyWMS.py,sha256=_HwJh3WVc0eHNCOPlQx40TVCdfXQF86Lb-_qpbzTC2M,8829
+wolfhece/PyWMS.py,sha256=LWkQk3R7miiVal-n5K5P5ClSQJA_vi5ImBxYGuxCx9A,9122
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
 wolfhece/RatingCurve_xml.py,sha256=cUjReVMHFKtakA2wVey5zz6lCgHlSr72y7ZfswZDvTM,33891
@@ -41,7 +41,7 @@ wolfhece/ins.py,sha256=uUeLMS1n3GPnfJhxl0Z2l-UXpmPUgthuwct282OOEzk,36184
 wolfhece/irm_qdf.py,sha256=DMdDEAYbgYxApObm6w-dZbBmA8ec6PghBLXR2lUEZLc,27457
 wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
 wolfhece/lagrange_multiplier.py,sha256=0G-M7b2tGzLx9v0oNYYq4_tLAiHcs_39B4o4W3TUVWM,6567
-wolfhece/lifewatch.py,sha256=TOqmbD_fuxXLvrnx401z5OxMqOBBSn-7Yg6flndWXFE,3324
+wolfhece/lifewatch.py,sha256=AszCItQCq3Z3d-gznsjtYU9FIKJaWAcr1gafBxb-qHs,16265
 wolfhece/matplotlib_fig.py,sha256=vnFI6sghw9N9jKhR8X1Z4aWli_5fPNylZQtFuujFJDY,84075
 wolfhece/multiprojects.py,sha256=Sd6Bl6YP33jlR79A6rvSLu23vq8sqbFYL8lWuVPkEpE,21549
 wolfhece/picc.py,sha256=0X_pzhSBoVxgtTfJ37pkOQO3Vbr9yurPaD1nVeurx8k,8531
@@ -58,7 +58,7 @@ wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=map7HsGYML_o5NHRdFg2s_TVQed_lDnpYNDv27MM0Vw,14130
 wolfhece/tools2d_dll.py,sha256=oU0m9XYAf4CZsMoB68IuKeE6SQh-AqY7O5NVED8r9uw,13125
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
-wolfhece/wolf_array.py,sha256=t6-gLy1Op3Lx6Nmxv-Yo7cQIW62BinFDRP7x6Qpb5u8,486606
+wolfhece/wolf_array.py,sha256=YtrTYzYhJKMewxDkkaiVjFfd7XBq6DNBE3uHdIpgmJY,490755
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=IvFtekT5iLU2sivZOOlJXpE4CevjTQYSxHaOp4cH_wI,17723
 wolfhece/wolf_tiles.py,sha256=v-HohqaWuMYdn75XLnA22dlloAG90iwnIqrgnB0ASQ4,10488
@@ -86,7 +86,7 @@ wolfhece/apps/curvedigitizer.py,sha256=lEJJwgAfulrrWQc-U6ij6sj59hWN3SZl4Yu1kQxVz
 wolfhece/apps/hydrometry.py,sha256=lhhJsFeb4zGL4bNQTs0co85OQ_6ssL1Oy0OUJCzhfYE,656
 wolfhece/apps/isocurrent.py,sha256=dagmGR8ja9QQ1gwz_8fU-N052hIw-W0mWGVkzLu6C7I,4247
 wolfhece/apps/splashscreen.py,sha256=eCPAUYscZPWDYKBHDBWum_VIcE7WXOCBe1GLHL3KUmU,3088
-wolfhece/apps/version.py,sha256=lVoU-2zAdKqdc2HowaZyYIpzDeY0BVhAVNi5RcXr7ig,387
+wolfhece/apps/version.py,sha256=imjv2iLmDitvnvE91s2oHHPHEwKdSfXQkxnrkAddHV4,387
 wolfhece/apps/wolf.py,sha256=j_CgvsL8rwixbVvVD5Z0s7m7cHZ86gmFLojKGuetMls,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -112,9 +112,9 @@ wolfhece/clientserver/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 wolfhece/clientserver/clientserver.py,sha256=sNJ8STw0kqUjCB4AerqZNbzCtl5WRe_JRvhe7whNoSE,2798
 wolfhece/coupling/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/coupling/hydrology_2d.py,sha256=QBIcgujfOX1xX3ARF2PQz6Uqwu3j6EaRw0QlGjG_H7k,53090
-wolfhece/drowning_victims/Class.py,sha256=W7oliBnGE_4i2NwkLgOqdq4eo0EuDdR1qMDF1fGfYUo,94132
-wolfhece/drowning_victims/Functions.py,sha256=hlAOyzt15GYe0urDPYquJaV6i0LyDj7X5BAUGE6ppso,47535
 wolfhece/drowning_victims/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wolfhece/drowning_victims/drowning_class.py,sha256=xWr_SoFqpodQ51x2CqCRbfIiL903kk2YqIRoU35xZy0,93482
+wolfhece/drowning_victims/drowning_functions.py,sha256=hlAOyzt15GYe0urDPYquJaV6i0LyDj7X5BAUGE6ppso,47535
 wolfhece/eva/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/eva/bootstrap.py,sha256=Ys4xTDIvG_QtxCKWLYzb3_XAZU441jGX7fHIbd9Mvr0,840
 wolfhece/eva/hydrogramme_mono.py,sha256=uZFIgJJ-JogMFzt7D7OnyVaHvgxCQJPZz9W9FgnuthA,8138
@@ -249,6 +249,7 @@ wolfhece/models/6_coul.pal,sha256=z7NK2dg0tAQBUweRQV54dIwJbPM1U5y1AR2LLw19Idw,14
 wolfhece/models/7_coul.pal,sha256=XTnnUyCE8ONokScB2YzYDnSTft7E6sppmr7P-XwMsCE,205
 wolfhece/models/Froude.pal,sha256=FmrvUI01fv4k0ygqDJEYdC1M9Fn72Sr6Sn2IlZAm0KA,138
 wolfhece/models/HECE_169.pptx,sha256=OWJtsWz504A-REFaaxw8lwStHyQU2l7KEeiE7IZvtbk,3396930
+wolfhece/models/Lifewatch.pal,sha256=ZSmJtTvwU37kDlNgtc6ohh2M19EhVSbdeyiJIS4wId8,292
 wolfhece/models/Risque_TAF.pal,sha256=Tnbx-_gIyCszzwmwo0I9vvFfVVKmATjFXS89AoZwTOs,135
 wolfhece/models/blue.pal,sha256=s9-wEPzSiKMMHuKofUB2FPjmyO7HfGM2xWaUJwsKAY8,39
 wolfhece/models/blues.pal,sha256=0ZEU1p9EcKwsCvNjU0s9_9aVakqQ71LDNoddVBAluEs,509
@@ -313,8 +314,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=8PlMYrb_8jI8h9F0_EagpM
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=ORy7fz4dcp691qKzaOZHrRLZ0uXNhL-LIHxmpDGL6BI,5007
 wolfhece/wintab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/wintab/wintab.py,sha256=8A-JNONV6ujgsgG3lM5Uw-pVgglPATwKs86oBzzljoc,7179
-wolfhece-2.2.3.dist-info/METADATA,sha256=7nhPe_QhpAi0TfGLOiKVOAdqSKC1Niqz3xWKfBIEqqM,2744
-wolfhece-2.2.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-wolfhece-2.2.3.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.2.3.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.3.dist-info/RECORD,,
+wolfhece-2.2.5.dist-info/METADATA,sha256=9v84rbmTr0ngAwq3vgROTfRNq7plNxUkXPxWVWhoq-E,2744
+wolfhece-2.2.5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+wolfhece-2.2.5.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.2.5.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.5.dist-info/RECORD,,