wolfhece 2.1.27__py3-none-any.whl → 2.1.29__py3-none-any.whl

wolfhece/PyDraw.py

@@ -7489,9 +7489,9 @@ class WolfMapViewer(wx.Frame):
             self._set_active_bc()
 
             #Print info in the status bar
-            txt  = 'Dx : {:4f} ; Dy : {:4f}'.format(self.active_array.dx, self.active_array.dy)
-            txt += ' ; Xmin : {:4f} ; Ymin : {:4f}'.format(self.active_array.origx, self.active_array.origy)
-            txt += ' ; Xmax : {:4f} ; Ymax : {:4f}'.format(self.active_array.origx + self.active_array.dx * float(self.active_array.nbx),
+            txt  = 'Dx : {:.4f} ; Dy : {:.4f}'.format(self.active_array.dx, self.active_array.dy)
+            txt += ' ; Xmin : {:.4f} ; Ymin : {:.4f}'.format(self.active_array.origx, self.active_array.origy)
+            txt += ' ; Xmax : {:.4f} ; Ymax : {:.4f}'.format(self.active_array.origx + self.active_array.dx * float(self.active_array.nbx),
                                                            self.active_array.origy + self.active_array.dy * float(self.active_array.nby))
             txt += ' ; Nx : {:d} ; Ny : {:d}'.format(self.active_array.nbx, self.active_array.nby)
 

wolfhece/PyPalette.py

@@ -333,6 +333,14 @@ class wolfpalette(wx.Frame,LinearSegmentedColormap):
             self.nb = i
             self.values=self.values[0:i]
             self.colors=self.colors[0:i,:]
+        else:
+            self.nb = i
+            oldvalues = self.values
+            oldcolors = self.colors
+            self.values = np.zeros(self.nb , dtype=float)
+            self.colors = np.zeros((self.nb,4) , dtype=int)
+            self.values[0:len(oldvalues)] = oldvalues
+            self.colors[0:len(oldcolors),:] = oldcolors
 
         update = False
 

wolfhece/acceptability/Parallels.py

@@ -44,7 +44,8 @@ def parallel_gpd_clip(layer:list[str],
 def parallel_v2r(manager:Accept_Manager,
                  attribute:str, 
                  pixel:float,
-                 number_procs:int = 1):
+                 number_procs:int = 1,
+                 convert_to_sparse:bool = False):
     """ 
     Convert the vector layers to raster.
 
@@ -63,14 +64,17 @@ def parallel_v2r(manager:Accept_Manager,
     layers = manager.get_layers_in_codevulne()
 
     if number_procs == 1:
+        result_list=[]
         for curlayer in layers:
-            vector_to_raster(curlayer, manager, attribute, pixel)
+            result_list.append(vector_to_raster(curlayer, manager, attribute, pixel,convert_to_sparse))
+
     else:
         pool = multiprocessing.Pool(processes=number_procs)
         prod_x=partial(vector_to_raster,
                        manager=manager, 
                        attribute=attribute, 
-                       pixel_size=pixel) 
+                       pixel_size=pixel,
+                       convert_to_sparse=convert_to_sparse) 
         
         result_list = pool.map(prod_x, layers)
 

wolfhece/acceptability/acceptability.py

@@ -1,5 +1,7 @@
 from .Parallels import parallel_gpd_clip, parallel_v2r, parallel_datamod 
-from .func import data_modification, compute_vulnerability, compute_vulnerability4scenario, match_vulnerability2sim, compute_acceptability, shp_to_raster, Accept_Manager, cleaning_directory, EXTENT, Vulnerability_csv
+from .func import data_modification, compute_vulnerability, compute_vulnerability4scenario
+from .func import match_vulnerability2sim, compute_acceptability, shp_to_raster, clip_layer
+from .func import Accept_Manager, cleaning_directory, EXTENT, Vulnerability_csv, compute_code
 
 import pandas as pd
 import os
@@ -31,6 +33,8 @@ class steps_vulnerability(Enum):
     Enum for the steps in the vulnerability computation
     """
     CREATE_RASTERS = 1
+    CREATE_RASTERS_VULN = 10
+    CREATE_RASTERS_CODE = 11
     APPLY_MODIFS = 2
     MATCH_SIMUL = 3
 
@@ -42,7 +46,8 @@ def Base_data_creation(main_dir:str = 'Data',
                        CE_IGN_top10v:str = 'CE_IGN_TOP10V/CE_IGN_TOP10V.shp',
                        resolution:float = 1.,
                        number_procs:int = 8,
-                       steps:list[int] | list[steps_base_data_creation] = [1,2,3,4,5,6,7]):
+                       steps:list[int] | list[steps_base_data_creation] = [1,2,3,4,5,6,7],
+                       Vuln_csv:str = 'Vulnerability.csv'):
     """
     Create the databse.
 
@@ -73,7 +78,8 @@ def Base_data_creation(main_dir:str = 'Data',
                            Original_gdb=Original_gdb,
                            CaPa_Walloon=CaPa_Walloon,
                            PICC_Walloon=PICC_Walloon,
-                           CE_IGN_top10v=CE_IGN_top10v)
+                           CE_IGN_top10v=CE_IGN_top10v,
+                           Vuln_csv=Vuln_csv)
 
     if not manager.check_before_database_creation():
         logging.error("The necessary files are missing - Verify logs for more information")
@@ -140,7 +146,9 @@ def Base_data_creation(main_dir:str = 'Data',
     if 5 in steps or steps_base_data_creation.RASTERIZE_IGN in steps:
         # ********************************************************************************************************************
         # Step 5 : Rasaterize the IGN data "Course d'eau" to get the riverbed mask
-        shp_to_raster(manager.CE_IGN_TOP10V, manager.SA_MASKED_RIVER, resolution)
+        LAYER_IGN = "CE_IGN_TOP10V"
+        clip_layer(layer=LAYER_IGN, file_path=manager.CE_IGN_TOP10V, Study_Area=manager.SA, output_dir=manager.TMP_IGNCE)
+        shp_to_raster(manager.TMP_IGNCE / (LAYER_IGN + '.gpkg'), manager.SA_MASKED_RIVER, resolution, manager=manager)
 
         done.append(steps_base_data_creation.RASTERIZE_IGN)
         
@@ -194,7 +202,11 @@ def Base_data_creation(main_dir:str = 'Data',
         cleaning_directory(manager.TMP_RASTERS_CODE)
         cleaning_directory(manager.TMP_RASTERS_VULNE)
         
-        Database_to_raster(main_dir, Study_area, resolution, number_procs=number_procs)
+        Database_to_raster(main_dir, 
+                           Study_area, 
+                           resolution, 
+                           number_procs=number_procs,
+                           Vuln_csv=Vuln_csv)
 
         done.append(steps_base_data_creation.DATABASE_TO_RASTER)
 
@@ -205,7 +217,8 @@ def Base_data_creation(main_dir:str = 'Data',
 def Database_to_raster(main_dir:str = 'Data',
                        Study_area:str = 'Bassin_Vesdre.shp',
                        resolution:float = 1.,
-                       number_procs:int = 16):
+                       number_procs:int = 16,
+                       Vuln_csv:str = 'Vulnerability.csv'):
     """ 
     Convert the vector database to raster database based on their vulnerability values 
     
@@ -224,7 +237,7 @@ def Database_to_raster(main_dir:str = 'Data',
     The parallel processing is safe as each layer is processed independently.
     """
 
-    manager = Accept_Manager(main_dir, Study_area)
+    manager = Accept_Manager(main_dir, Study_area, Vuln_csv=Vuln_csv)
 
     resolution = float(resolution)
 
@@ -238,7 +251,7 @@ def Database_to_raster(main_dir:str = 'Data',
     
     attributes = ["Vulne", "Code"]
     for cur_attrib in attributes:
-        parallel_v2r(manager, cur_attrib, resolution, number_procs)
+        parallel_v2r(manager, cur_attrib, resolution, number_procs, convert_to_sparse=True)
 
     manager.restore_dir()
 
@@ -246,7 +259,9 @@ def Vulnerability(main_dir:str = 'Data',
                   scenario:str = 'Scenario1',
                   Study_area:str = 'Bassin_Vesdre.shp',
                   resolution:float = 1.,
-                  steps:list[int] | list[steps_vulnerability] = [1,2,3]):
+                  steps:list[int] | list[steps_vulnerability] = [1,10,11,2,3],
+                  Vuln_csv:str = 'Vulnerability.csv',
+                  Intermediate_csv:str = 'Intermediate.csv'):
     """
     Compute the vulnerability for the study area and the scenario, if needed.
 
@@ -273,7 +288,11 @@ def Vulnerability(main_dir:str = 'Data',
 
     """
 
-    manager = Accept_Manager(main_dir, Study_area, scenario=scenario)
+    manager = Accept_Manager(main_dir, 
+                             Study_area, 
+                             scenario=scenario, 
+                             Vuln_csv=Vuln_csv,
+                             Intermediate_csv=Intermediate_csv)
 
     if not manager.check_before_vulnerability():
         logging.error("The necessary files are missing - Verify logs for more information")
@@ -292,7 +311,13 @@ def Vulnerability(main_dir:str = 'Data',
 
         cleaning_directory(manager.TMP_SCEN_DIR)
 
-        compute_vulnerability(manager)
+        if 10 in steps or steps_vulnerability.CREATE_RASTERS_VULN in steps:
+            compute_vulnerability(manager)
+            done.append(steps_vulnerability.CREATE_RASTERS_VULN)
+        
+        if 11 in steps or steps_vulnerability.CREATE_RASTERS_CODE in steps:
+            compute_code(manager)
+            done.append(steps_vulnerability.CREATE_RASTERS_CODE)
 
         done.append(steps_vulnerability.CREATE_RASTERS)
 
@@ -343,17 +368,20 @@ def Vulnerability(main_dir:str = 'Data',
 
 def Acceptability(main_dir:str = 'Vesdre',
                   scenario:str = 'Scenario1',
-                  Study_area:str = 'Bassin_Vesdre.shp'):
+                  Study_area:str = 'Bassin_Vesdre.shp',
+                  coeff_auto:bool = True,
+                  Ponderation_csv:str = 'Ponderation.csv'):
     """ Compute acceptability for the scenario """
     
-    manager = Accept_Manager(main_dir, Study_area, scenario=scenario)
+    manager = Accept_Manager(main_dir, 
+                             Study_area, 
+                             scenario=scenario,
+                             Ponderation_csv=Ponderation_csv)
 
     manager.change_dir()
 
     # Load the vulnerability raster **for the scenario**
     vulne = gdal.Open(str(manager.OUT_VULN))
-    # Convert to numpy array
-    vulne = vulne.GetRasterBand(1).ReadAsArray() 
 
     # Load the river mask
     riv = gdal.Open(str(manager.OUT_MASKED_RIVER))
@@ -362,7 +390,11 @@ def Acceptability(main_dir:str = 'Vesdre',
     geotrans = riv.GetGeoTransform()  
     proj = riv.GetProjection()  
 
+    assert vulne.GetGeoTransform() == riv.GetGeoTransform(), "The geotransform of the two rasters is different"
+    assert vulne.GetProjection() == riv.GetProjection(), "The projection of the two rasters is different"
+
     # Convert to numpy array
+    vulne = vulne.GetRasterBand(1).ReadAsArray() 
     riv = riv.GetRasterBand(1).ReadAsArray()    
 
     # Get the return periods available
@@ -446,10 +478,19 @@ def Acceptability(main_dir:str = 'Vesdre',
     # pond.set_index("Interval", inplace=True)
 
     # Get ponderations for the return periods
-    pond = manager.get_ponderations()
+    if coeff_auto:
+        pond = manager.get_ponderations()
+        assert pond["Ponderation"].sum() > 0.999999 and pond["Ponderation"].sum()<1.0000001, "The sum of the ponderations is not equal to 1"
+
+    elif manager.is_valid_ponderation_csv:
+        pond = pd.read_csv(manager.PONDERATION_CSV)
+        pond.set_index("Interval", inplace=True)
+    else:
+        logging.error("The ponderation file is missing")
+        logging.info("Please provide the ponderation file or set 'coeff_auto' to True")
+        return
 
     assert len(pond) == len(return_periods), "The number of ponderations is not equal to the number of return periods"
-    assert pond["Ponderation"].sum() > 0.999999 and pond["Ponderation"].sum()<1.0000001, "The sum of the ponderations is not equal to 1"
 
     # Initialize the combined acceptability matrix -- Ponderate mean of the local acceptability
     comb = np.zeros(q_dict["vm{}".format(return_periods[-1])].shape)