wolfhece 2.2.41__py3-none-any.whl → 2.2.43__py3-none-any.whl

wolfhece/wolf_array.py

@@ -116,6 +116,30 @@ try:
 except ImportError as e:
     raise Exception(_('Error importing pydownloader module'))
 
+
+import math
+from fractions import Fraction
+
+def pgcd_decimal(a, b):
+    # Convertir les décimaux en fractions exactes
+    fa = Fraction(a).limit_denominator()
+    fb = Fraction(b).limit_denominator()
+
+    # Extraire les numérateurs et dénominateurs
+    num_a, den_a = fa.numerator, fa.denominator
+    num_b, den_b = fb.numerator, fb.denominator
+
+    # Mettre au même dénominateur
+    lcm_den = math.lcm(den_a, den_b)
+    a_int = num_a * (lcm_den // den_a)
+    b_int = num_b * (lcm_den // den_b)
+
+    # PGCD des entiers
+    pgcd_int = math.gcd(a_int, b_int)
+
+    # Revenir à l’échelle décimale
+    return pgcd_int / lcm_den
+
 WOLF_ARRAY_HILLSHAPE = -1
 WOLF_ARRAY_FULL_SINGLE = 1
 WOLF_ARRAY_FULL_DOUBLE = 2
@@ -7288,6 +7312,8 @@ class WolfArray(Element_To_Draw, header_wolf):
         else:
             return
 
+        need_wx = False
+
         raster:gdal.Dataset
         if crop is not None :
             if not os.path.exists(fn):
@@ -7297,44 +7323,47 @@ class WolfArray(Element_To_Draw, header_wolf):
             tmpdx = self.dx
 
             fn_crop = fn + '_crop.tif'
-            if type(crop) is np.ndarray:
-                pass
-            elif type(crop) is list:
-                pass
-            else:
-                if not self.wx_exists:
-                    logging.error(_('Crop must be a list or a numpy array with 4 values - xmin, xmax, ymin, ymax'))
-                    return
 
-                raster_in:gdal.Dataset
-                raster_in = gdal.Open(fn)
+            raster_in:gdal.Dataset
+            raster_in = gdal.Open(fn)
 
-                proj = raster_in.GetProjection()
-                # check if proj is epsg:31370
-                if 'Lambert 72' not in proj and "31370" not in proj:
-                    logging.error(_('{} projection is not Lambert 72 - EPSG:31370').format(fn))
+            proj = raster_in.GetProjection()
+            # check if proj is epsg:31370
+            if 'Lambert 72' not in proj and "31370" not in proj:
+                logging.error(_('{} projection is not Lambert 72 - EPSG:31370').format(fn))
 
-                    raster_in2 = gdal.Dataset()
-                    gdal.Warp(raster_in2, raster_in, dstSRS='EPSG:31370')
+                raster_in2 = gdal.Dataset()
+                gdal.Warp(raster_in2, raster_in, dstSRS='EPSG:31370')
 
-                    # Close the raster_in
-                    raster_in.FlushCache()
-                    raster_in = None
+                # Close the raster_in
+                raster_in.FlushCache()
+                raster_in = None
 
-                    raster_in = raster_in2
+                raster_in = raster_in2
 
-                    if raster_in is None:
-                        logging.error(_('Could not reproject the file {fn}'))
-                        return
+                if raster_in is None:
+                    logging.error(_('Could not reproject the file {fn}'))
+                    return
 
-                geotr = raster_in.GetGeoTransform()
-                self.dx = geotr[1]
-                self.dy = abs(geotr[5])
+            geotr = raster_in.GetGeoTransform()
+            self.dx = geotr[1]
+            self.dy = abs(geotr[5])
 
-                ulx = geotr[0]
-                uly = geotr[3]
-                llx = ulx + geotr[1] * raster_in.RasterXSize
-                lly = uly + geotr[5] * raster_in.RasterYSize
+            ulx = geotr[0]
+            uly = geotr[3]
+            llx = ulx + geotr[1] * raster_in.RasterXSize
+            lly = uly + geotr[5] * raster_in.RasterYSize
+
+            if type(crop) is np.ndarray:
+                pass
+            elif type(crop) in [list, tuple]:
+                pass
+            else:
+                if not self.wx_exists:
+                    logging.error(_('Crop must be a list or a numpy array with 4 values - xmin, xmax, ymin, ymax'))
+                    return
+
+                need_wx = True
 
                 newcrop = CropDialog(None, self.get_mapviewer())
 
@@ -7375,7 +7404,7 @@ class WolfArray(Element_To_Draw, header_wolf):
 
             xmin, xmax, ymin, ymax = crop
 
-            if self.wx_exists:
+            if need_wx:
 
                 with wx.FileDialog(None, _('Save the cropped file for later'), wildcard="Tiff files (*.tif)|*.tif",
                                     style=wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT) as fileDialog:
@@ -7393,15 +7422,13 @@ class WolfArray(Element_To_Draw, header_wolf):
 
                 fn  = fn_crop
             else:
-                from tempfile import NamedTemporaryFile
-                tmpfile = NamedTemporaryFile(suffix='.tif')
+                fn_tmp = '__tmp_wolf.tif'
 
                 if uly > lly:
-                    raster = gdal.Translate(str(tmpfile.name), fn, projWin=[xmin, ymax, xmax, ymin])
+                    raster = gdal.Translate(fn_tmp, fn, projWin=[xmin, ymax, xmax, ymin])
                 else:
-                    raster = gdal.Translate(str(tmpfile.name), fn, projWin=[xmin, ymin, xmax, ymax])
-
-                fn = str(tmpfile.name)
+                    raster = gdal.Translate(fn_tmp, fn, projWin=[xmin, ymin, xmax, ymax])
+                fn = fn_tmp
         else:
             raster = gdal.Open(fn)
 
@@ -7501,6 +7528,12 @@ class WolfArray(Element_To_Draw, header_wolf):
         raster.FlushCache()
         raster = None
 
+        try:
+            if fn_tmp == '__tmp_wolf.tif':
+                os.remove(fn_tmp)
+        except:
+            pass
+
     def add_ops_sel(self):
         """
         Adding selection manager and operations array
@@ -10254,7 +10287,7 @@ class WolfArray(Element_To_Draw, header_wolf):
             self.write_txt_header()
             self.write_array()
 
-    def get_rebin_shape_size(self, factor:float) -> tuple[tuple[int, int], tuple[float, float]]:
+    def get_rebin_shape_size(self, factor:float, reshape_array_if_necessary:bool = False) -> tuple[tuple[int, int], tuple[float, float]]:
         """
         Return the new shape after rebinning.
 
@@ -10274,13 +10307,44 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         newnbx = self.nbx
         newnby = self.nby
-        if np.mod(self.nbx,factor) != 0 or np.mod(self.nby,factor) != 0 :
-            newnbx = self.nbx
-            newnby = self.nby
-            if np.mod(self.nbx,factor) !=0:
-                newnbx = self.nbx + factor - np.mod(self.nbx,factor)
-            if np.mod(self.nby,factor) !=0:
-                newnby = self.nby + factor - np.mod(self.nby,factor)
+
+        if factor >=1.0:
+            # Decrease resolution
+            to_reshape = False
+            if np.mod(self.nbx,factor) != 0 or np.mod(self.nby,factor) != 0 :
+                newnbx = self.nbx
+                newnby = self.nby
+                if np.mod(self.nbx,factor) !=0:
+                    newnbx = int(self.nbx + factor - np.mod(self.nbx,factor))
+                    to_reshape = True
+                if np.mod(self.nby,factor) !=0:
+                    newnby = int(self.nby + factor - np.mod(self.nby,factor))
+                    to_reshape = True
+
+                if to_reshape and reshape_array_if_necessary:
+                    logging.warning(f"The shape ({self.nbx}, {self.nby}) is not a multiple of the factor {factor}")
+                    new_array = ma.masked_array(np.ones((newnbx, newnby), dtype= self.dtype) * self.nullvalue, dtype= self.dtype)
+                    new_array[:self.nbx, :self.nby] = self.array
+                    self.array = new_array
+        else:
+            # Increase resolution
+            if abs(int(1/factor) - 1/factor) > 1e-6:
+                # find the greatest common divisor of between self.dx and old_dx
+                gcd = pgcd_decimal(self.dx, self.dx * factor)
+                intermediate_factor = gcd / self.dx
+
+                [newnbx,newnby], [dx,dy] = self.get_rebin_shape_size(intermediate_factor)
+
+                factor = factor / intermediate_factor
+
+                if np.mod(newnbx,factor) != 0 or np.mod(newnby,factor) != 0 :
+                    if np.mod(newnbx,factor) !=0:
+                        newnbx = int(newnbx + factor - np.mod(newnbx,factor))
+                    if np.mod(newnby,factor) !=0:
+                        newnby = int(newnby + factor - np.mod(newnby,factor))
+
+                newdx = dx * factor
+                newdy = dy * factor
 
         newnbx = int(newnbx / factor)
         newnby = int(newnby / factor)
@@ -10327,6 +10391,9 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         """
 
+        op_str = operation
+        (testnbx, testnby), __ = self.get_rebin_shape_size(factor)
+
         if operation_matrix is not None:
             tmp_header = self.get_rebin_header(factor)
             if not operation_matrix.is_like(tmp_header):
@@ -10348,36 +10415,11 @@ class WolfArray(Element_To_Draw, header_wolf):
                 logging.error(_("Operator not supported -- Must be a string in ['sum', 'mean', 'min', 'max', 'median'] or a Rebin_Ops Enum"))
 
 
-        if np.mod(self.nbx,factor) != 0 or np.mod(self.nby,factor) != 0 :
-            # The shape is adjusted to be a multiple of the factor.
-            # Fill the array with nullvalue
-            newnbx = self.nbx
-            newnby = self.nby
-            if np.mod(self.nbx,factor) !=0:
-                newnbx = int(self.nbx + factor - np.mod(self.nbx,factor))
-            if np.mod(self.nby,factor) !=0:
-                newnby = int(self.nby + factor - np.mod(self.nby,factor))
-
-            # We ensure that the null_value is converted to the type of the array.
-            # Not doing so leads to a change in the array type because
-            # of numpy2 type promotion.
-            newarray = np.ma.masked_array( np.full((newnbx,newnby), self.nullvalue, dtype = self.dtype) )
-            #newarray = np.ma.ones((newnbx,newnby), dtype = self.dtype) * self.nullvalue
-            newarray[:self.nbx,:self.nby] = self.array
-            newarray.mask[:self.nbx,:self.nby] = self.array.mask
-            self.array = newarray
-
-            self.nbx = newnbx
-            self.nby = newnby
-
-        self.nbx = int(self.nbx / factor)
-        self.nby = int(self.nby / factor)
-
-        self.dx = self.dx * float(factor)
-        self.dy = self.dy * float(factor)
-        new_shape = (self.nbx, self.nby)
-
-        if factor>1.:
+        new_shape, (dx, dy) = self.get_rebin_shape_size(factor, reshape_array_if_necessary= True)
+
+        if factor >=1.0:
+            # Decrease resolution
+
             if operation_matrix is not None:
                 # Reshape the input array to split it into blocks of size f x f
                 reshaped_a = self.array.reshape(new_shape[0], int(factor), new_shape[1], int(factor))
@@ -10407,15 +10449,43 @@ class WolfArray(Element_To_Draw, header_wolf):
             self.set_nullvalue_in_mask()
         else:
 
-            if (int(1/factor) - 1/factor) > 1e-6:
+            # Increase resolution
+
+            if abs(int(1/factor) - 1/factor) > 1e-6:
                 logging.warning(f"The factor {factor} doesn't lead to an integer dimension for the Kronecker product")
+                logging.warning("The array will be rebinned firstly using the most common factor and then using the operation")
+
+                # find the greatest common divisor of between self.dx and old_dx
+                gcd  = pgcd_decimal(self.dx, self.dx * factor)
+                intermediate_factor = gcd / self.dx
+
+                logging.warning(f"The greatest common divisor is {gcd}")
+
+                tmp = WolfArray(mold=self, whichtype=self.wolftype)
+                tmp.rebin(intermediate_factor)
 
-            ones = np.ones( (int(1/factor), int(1/factor)), dtype=int)
-            self.array = np.kron(self.array, ones).astype(self.array.dtype)
+                if op_str is None:
+                    op_str = 'min'
 
+                tmp.rebin(factor / intermediate_factor, operation= op_str)
+                self.array = tmp.array
+                tmp.array = None
+                del tmp
+            else:
+
+                ones = np.ones( (int(1/factor), int(1/factor)), dtype=int)
+                self.array = np.kron(self.array, ones).astype(self.array.dtype)
 
             self.mask_data(self.nullvalue)
 
+        self.nbx = new_shape[0]
+        self.nby = new_shape[1]
+        self.dx = dx
+        self.dy = dy
+
+        assert isinstance(self.array, ma.MaskedArray), _('The array must be a masked array')
+        assert self.array.shape == (testnbx, testnby), _(f'Bad shape: {self.array.shape} != {(testnbx, testnby)}')
+
         self.count()
 
         # rebin must not change the type of the array

{wolfhece-2.2.41.dist-info → wolfhece-2.2.43.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.41
+Version: 2.2.43
 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.41.dist-info → wolfhece-2.2.43.dist-info}/RECORD

@@ -9,7 +9,7 @@ wolfhece/MulticriteriAnalysis.py,sha256=vGmkzYagZohNe0XjwGJ6VUXcDPjOt80lNFthXpzx
 wolfhece/PandasGrid.py,sha256=etfVhIHzja4Z1EUY6BcDOKX-w7V-Xou1yaf0NMqmclo,4599
 wolfhece/PyConfig.py,sha256=13DDWjJdohYHwn1uRVHB0s8Jcwq_b9pwcwbAr8NlZyc,19667
 wolfhece/PyCrosssections.py,sha256=6K9xhupnIVXzLdsLTPN9e1v0xck9BdWZd0-EgpWg9us,133277
-wolfhece/PyDraw.py,sha256=d74OkFrQjN_41xk2jtlY53Pk2OgUD39gwUoOwmybKHU,737432
+wolfhece/PyDraw.py,sha256=jCXBonWGmqTQD9AXsii-yalFpUFLKTrfPP2wzh-57NE,741859
 wolfhece/PyGui.py,sha256=GpVRxNpR8WNDFyHnDvhtHFFsq_cZZlyVgSkFiS-ARYI,185342
 wolfhece/PyGuiHydrology.py,sha256=dmBlRO8AljsvCPH6eVt0l9ZLx7g5j7Ubl9Srk7ECwyA,34693
 wolfhece/PyHydrographs.py,sha256=1P5XAURNqCvtSsMQXhOn1ihjTpr725sRsZdlCEhhk6M,3730
@@ -61,13 +61,13 @@ wolfhece/pylogging.py,sha256=4TI8hgBB65z-zpvU5Rfa2jkPXPhJaqXjHVPwbcdzTNc,4528
 wolfhece/pypolygons_scen.py,sha256=NWaNeK0RSUeOkgukeogK9FLmQiDjGZ9yhqs9208fojM,46237
 wolfhece/pyshields.py,sha256=KMtUO5kD0lisKnJD1NsDz-qaY5DpFcmS4O3WkXtUSmo,27898
 wolfhece/pyviews.py,sha256=zuZjWUptRDm1MTE1PN4Xj_qSITnojgDMG0LlFIBH3SE,13739
-wolfhece/pywalous.py,sha256=6FTDh0dzKg7H6F7_YXEKT2gmE0OM_a8hvOLhEu4kRpY,26729
+wolfhece/pywalous.py,sha256=qF_hzmVFBjM3JP6RV4tbKEVTBsiOGcBJ_O82uoX2Rxg,38595
 wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=7hgfsLYAaE_rNKD-g8xsON8sdWvoV8vbqnGGxIayShE,14137
 wolfhece/tools2d_dll.py,sha256=TfvvmyZUqEZIH0uHwUCJf0bdmCks_AiidDt23Unsp5w,13550
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
 wolfhece/toolshydrology_dll.py,sha256=cIGyhxV8H5f7GXhDqAamM7uC0W0hQTou3eTkqZdnqBE,5656
-wolfhece/wolf_array.py,sha256=T0E46C-hmjJCGp66eHhOGohT_Wo7Jhp0hU6S_EPXYg4,576614
+wolfhece/wolf_array.py,sha256=39O7kYjksEbCC2yn0mu6AfabmVrBWrmoybbfjw4gfIQ,578890
 wolfhece/wolf_hist.py,sha256=fTEb60Q4TEwobdZsRU4CFXAId1eOKdWAqF8lnF1xEWc,3590
 wolfhece/wolf_texture.py,sha256=Pt1j_lX74p70Fj3y3qYxYMuN8gghVd8_ih1vFhTIdkA,23884
 wolfhece/wolf_tiles.py,sha256=v-HohqaWuMYdn75XLnA22dlloAG90iwnIqrgnB0ASQ4,10488
@@ -95,7 +95,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=EdGDN9NhudIiP7c3gVqj7dp4MWFB8ySizM_tpMnsgpE,3091
-wolfhece/apps/version.py,sha256=g5JvLHmxA33m1kAYqdyNA-LqHE0IxUtstI8t7gQzqQA,388
+wolfhece/apps/version.py,sha256=kWgIrbzo3PaJpeEetSvb9-zhutuO1cGL5wg1gqsJFDM,388
 wolfhece/apps/wolf.py,sha256=mRnjYsUu4KIsRuamdQWAINFMuwN4eJgMo9erG-hkZ70,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -243,7 +243,7 @@ wolfhece/mesh2d/config_manager.py,sha256=DcdxCIIs_dyC6ayJOBULeY364LONogL9PBaqBtC
 wolfhece/mesh2d/cst_2D_boundary_conditions.py,sha256=r43pHHdCtmNp5R2zh1Ckb7EzwQDf6C4YMLwRFTl4KMc,5006
 wolfhece/mesh2d/gpu_2d.py,sha256=xyZst3ZSYmRp9G0kxlUvTahAiMC9sNEH0MRUlEjqFZI,25999
 wolfhece/mesh2d/simple_2d.py,sha256=wqENJwpUPxKQcpGIcymQXUj2KgkGWCVH6cs4Os9h9Gs,112581
-wolfhece/mesh2d/wolf2dprev.py,sha256=oK9r94CYJaeOBSv4s4mkuhLA8rCsnrkjG2sGW_zR1x0,493127
+wolfhece/mesh2d/wolf2dprev.py,sha256=823RckzGGCQ00h0uti-nL7JoVsAZ_Hv9C02lnvizDIg,495518
 wolfhece/models/5_coul.pal,sha256=OI1UqcNIDBpJn2k_VDel__r-hKjjvdob0eqinGCI3QY,160
 wolfhece/models/6_coul.pal,sha256=z7NK2dg0tAQBUweRQV54dIwJbPM1U5y1AR2LLw19Idw,148
 wolfhece/models/7_coul.pal,sha256=XTnnUyCE8ONokScB2YzYDnSTft7E6sppmr7P-XwMsCE,205
@@ -265,6 +265,7 @@ wolfhece/models/shields_cst.pal,sha256=zUGFI6HiL0bsHeOzcWNih3F9cxXKXLLZYA5rtqRbz
 wolfhece/models/vulnerability.pal,sha256=Fevrc_9owywLhbPMBunXDcrGXPJhARo9iSV1eOq3roA,106
 wolfhece/models/walous_niv1.pal,sha256=mHMjCB-ja47mV3ZsvDOhS2CEK8YN6ewOkf1W7l7JQ8k,138
 wolfhece/models/walous_niv2.pal,sha256=B5wt5-O88dpaiA6yR4uriOy0tfDVU_cms0Xr6Dw9ZGg,377
+wolfhece/models/walous_ocs.pal,sha256=DlicMO2qlH3_WPm_bwVBK6lTuUn2MXRcfIpkjl8D2oo,227
 wolfhece/models/waterdepths.pal,sha256=8rcQfuZOeLKzYv5sARPkhpvZYc1OToj3ZukcbuRUgIY,136
 wolfhece/models/white_black.pal,sha256=BKjVN1kuk1OtJB9S3uM5fxteWbggI3Pb8p9WdDptT4c,51
 wolfhece/opengl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -319,8 +320,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=u4C7CXe_bUyGKx7c_Bi0x9
 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.41.dist-info/METADATA,sha256=r3CK5pZVkd6vWy34yNRUNSs-yzagEy7TbSM1vrGbG7c,2785
-wolfhece-2.2.41.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wolfhece-2.2.41.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
-wolfhece-2.2.41.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.41.dist-info/RECORD,,
+wolfhece-2.2.43.dist-info/METADATA,sha256=6-h2-a9g7o3Tg99jRn5s_izELlJ5gWaMZSPzG6SlW0A,2785
+wolfhece-2.2.43.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wolfhece-2.2.43.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
+wolfhece-2.2.43.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.43.dist-info/RECORD,,