wolfhece 2.1.120__py3-none-any.whl → 2.1.121__py3-none-any.whl

wolfhece/acceptability/func.py

@@ -152,7 +152,7 @@ class Accept_Manager():
 
     def __init__(self,
                  main_dir:str = 'Data',
-                 Study_area:str = 'Bassin_Vesdre.shp',
+                 Study_area = None,
                  scenario = None,
                  Original_gdb:str = 'GT_Resilence_dataRisques202010.gdb',
                  CaPa_Walloon:str = 'Cadastre_Walloon.gpkg',
@@ -171,9 +171,7 @@ class Accept_Manager():
         # If it is a string, concatenate it with the current directory
         if not self.main_dir.is_absolute():
             self.main_dir = Path(os.getcwd()) / self.main_dir
-
-        self._study_area = str(Study_area)
-
+        self._study_area = Study_area
         if Study_area is not None:
             if not str(self._study_area).endswith('.shp'):
                 self._study_area += '.shp'
@@ -391,7 +389,7 @@ class Accept_Manager():
             self._study_area = None
             self._scenario = None
         else:
-            if Study_area in self.get_list_studyareas(with_suffix=True):
+            if Study_area in self.get_list_studyareas(with_suffix=True) or Study_area+".shp" in self.get_list_studyareas(with_suffix=True):
                 self._study_area = Path(Study_area)
             else:
                 logging.error("The study area does not exist in the study area directory")
@@ -474,18 +472,17 @@ class Accept_Manager():
         sims = self.get_sims_files_for_scenario()
 
         if len(sims)==0:
-            logging.info("No simulations found") #no error, need to act if so. See accept manager flow chart
+            logging.info("No simulations found at this stage") 
             return None
 
         if "_h.tif" in sims[0].name:
             for cursim in sims:
-                if cursim.stem.find("_T{}_".format(return_period)) != -1:
+                if cursim.stem.find("_T{}_".format(return_period)) != -1  or cursim.stem.find("_Q{}_".format(return_period))  != -1:
                     return cursim
         else:
             for cursim in sims:
-                if cursim.stem.find("T{}".format(return_period)) != -1:
+                if cursim.stem.find("T{}".format(return_period)) != -1 or cursim.stem.find("Q{}".format(return_period))  != -1:
                     return cursim
-
         return None
 
     def get_types_in_file(self, file:str) -> list[str]:
@@ -560,44 +557,36 @@ class Accept_Manager():
 
         # List files in directory
         sims = self.get_sims_files_for_scenario()
-
+        sims_modif = [
+            os.path.join(os.path.dirname(path), os.path.basename(path).replace("Q", "T"))
+            for path in sims
+            ]
+        
         if len(sims)==0:
-            logging.info("No simulations found")#no error, need to act if so. See accept manager flow chart
+            logging.info("No simulations found at this stage.")
             return []
 
-        # Two cases:
-        # - Return periods are named as T2.tif, T5.tif, T10.tif, ...
-        # - Return periods are named as *_T2_h.tif, *_T5_h.tif, *_T10_h.tif, ...
-
-        if "_h.tif" in sims[0].name:
-
-            # Searching for the position of the return period in the name
-            idx_T = [cursim.name.find("_T") for cursim in sims]
-            idx_h = [cursim.name.find("_h.tif") for cursim in sims]
-
-            assert len(idx_T) == len(idx_h), "The number of T and h are not the same"
-            for curT, curh in zip(idx_T, idx_h):
-                assert curT != -1, "The T is not found"
-                assert curh != -1, "The h is not found"
-                assert curh > curT, "The h is before the T"
-
-            # Create the list of return periods -- only the numeric part
-            sims = [int(cursim.name[idx_T[i]+2:idx_h[i]]) for i, cursim in enumerate(sims)]
-        else:
-            # searching for the position of the return period in the name
-            idx_T = [cursim.name.find("T") for cursim in sims]
-            idx_h = [cursim.name.find(".tif") for cursim in sims]
-
-            assert len(idx_T) == len(idx_h), "The number of T and h are not the same"
-            for curT, curh in zip(idx_T, idx_h):
-                assert curT != -1, "The T is not found"
-                assert curh != -1, "The h is not found"
-                assert curh > curT, "The h is before the T"
-
-            # create the list of return periods -- only the numeric part
-            sims = [int(cursim.name[idx_T[i]+1:idx_h[i]]) for i, cursim in enumerate(sims)]
-
+        # - Return periods are named as T2.tif, T5.tif, T10.tif, ... or with Q instead of T
+        # searching for the position of the return period in the name
+        idx_T = [Path(cursim).name.find("T") for cursim in sims_modif]
+        idx_h = [Path(cursim).name.find(".tif") for cursim in sims_modif]
+        
+        # create the list of return periods -- only the numeric part
+        sims = [int(Path(cursim).name[idx_T[i]+1:idx_h[i]]) for i, cursim in enumerate(sims_modif)]
         return sorted(sims)
+    
+    def get_modifiedrasters(self):
+        folder = Path(self.IN_CH_SA_SC)
+        vuln_tiff_files = [str(file.name) for file in folder.rglob("*.tiff") if file.name.startswith('vuln_')]
+        vuln_tif_files = [str(file.name)for file in folder.rglob("*.tif") if file.name.startswith('vuln_')]
+        vuln_files = vuln_tiff_files + vuln_tif_files  
+
+        folder = Path(self.IN_CH_SA_SC)
+        mnt_tiff_files = [str(file.name) for file in folder.rglob("*.tiff") if file.name.startswith('MNTmodifs_')]
+        mnt_tif_files = [str(file.name) for file in folder.rglob("*.tif") if file.name.startswith('MNTmodifs_')]
+        mnt_files = mnt_tiff_files + mnt_tif_files
+        
+        return vuln_files + mnt_files
 
     def get_ponderations(self) -> pd.DataFrame:
         """ Get the ponderation data from available simulations """
@@ -605,11 +594,11 @@ class Accept_Manager():
         rt = self.get_return_periods()
 
         if len(rt)==0:
-            logging.info("No simulations found")
+            logging.info("No simulations found at this stage.")
             return None
 
         if len(rt)<2:
-            logging.info("There is only one simulation!")
+            logging.info("There is only one simulation! Weigthing coefficient is unique and set to 1.")
             return pd.DataFrame(1, columns=["Ponderation"], index=rt)
 
         else :
@@ -979,7 +968,7 @@ class Accept_Manager():
 
     def select_name_tif(self, path_baseline: Path, folder_path: Path, name) -> list[Path]:
         """
-        Collects and appends all .tiff files starting with 'vuln' from folder_path into a list.
+        Collects and appends all .tiff files starting with 'name' from folder_path into a list.
         """
         files = []
         #first element must be vulnerability_baseline
@@ -991,23 +980,21 @@ class Accept_Manager():
             files.append(tree[-1].as_posix())
         return files
 
-    def check_nodata(self, name):
+    def check_nodata(self, name, path_baseline):
             """ Check nodata in a path """
-
-            list_tif = Accept_Manager.select_name_tif(self, self.OUT_VULN, self.IN_CH_SA_SC, name)
+            list_tif = Accept_Manager.select_name_tif(self, path_baseline, self.IN_CH_SA_SC, name)
             for cur_lst in list_tif:
-                if "Vulnerability.tiff" not in cur_lst:
-                    curarray:WolfArray = WolfArray(cur_lst)
-                    if curarray.nullvalue != 99999.:
-                        curarray.nullvalue = 99999.
-                        curarray.set_nullvalue_in_mask()
-                        curarray.write_all()
-                        logging.warning(_('nodata changed in favor of 99999. value for file {} !'.format(cur_lst)))
+                curarray:WolfArray = WolfArray(cur_lst)
+                if curarray.nullvalue != 99999.:
+                    curarray.nullvalue = 99999.
+                    curarray.set_nullvalue_in_mask()
+                    curarray.write_all()
+                    logging.warning(_('nodata changed in favor of 99999. value for file {} !'.format(cur_lst)))
 
     def create_vrtIfExists(self, fn_baseline, fn_scenario, fn_vrt, name):
         """ Create a vrt file from a path """
         logging.info(_('Checking nodata values...'))
-        self.check_nodata(name)
+        self.check_nodata(name, fn_baseline)
         list_tif = Accept_Manager.select_name_tif(self, fn_baseline, fn_scenario, name)
         #création du fichier vrt - assembly/agglomération
         if len(list_tif)>1:
@@ -1536,7 +1523,8 @@ def match_vulnerability2sim(inRas:Path, outRas:Path, MODREC:Path):
 def update_accept(accept, model_h, ij, bounds, loc_accept):
     for idx in range(len(bounds)):
         for i,j in ij:
-            if bounds[idx,0] < model_h[i,j] <= bounds[idx,1]: #lit dans wd vs Ti où on est et associe son score d'accept
+            #lit dans wd vs Ti où on est et associe son score d'accept
+            if bounds[idx,0] < model_h[i,j] <= bounds[idx,1]: 
                 accept[i,j] = loc_accept[idx]
 
 def compute_acceptability(manager:Accept_Manager,

wolfhece/apps/version.py

@@ -5,7 +5,7 @@ class WolfVersion():
 
         self.major = 2
         self.minor = 1
-        self.patch = 120
+        self.patch = 121
 
     def __str__(self):
 

wolfhece/wolfresults_2D.py

@@ -4350,7 +4350,7 @@ class Wolfresults_2D(Element_To_Draw):
                                   filename: str | Path,
                                   for_steps:tuple[int] | list[int] = (0,-1,1),
                                   erase_if_exists:bool = True,
-                                  only_stats:bool = True):
+                                  all_values:bool = GL_FRAGMENT_INTERPOLATION_OFFSET_BITS):
         """ Export some results at one or multiple coordinates defined by a vector or a list of coordinates
         or a polygon as CSV file
         """
@@ -4363,6 +4363,9 @@ class Wolfresults_2D(Element_To_Draw):
         if erase_if_exists and filename.exists():
             filename.unlink()
 
+        if erase_if_exists and filename.with_stem(filename.stem + '_stats').exists():
+            filename.with_stem(filename.stem + '_stats').unlink()
+
         (times, steps), vals = self.get_values_xyorpoly_series(xy, which, for_steps)
 
         mean= []
@@ -4393,16 +4396,16 @@ class Wolfresults_2D(Element_To_Draw):
             for i in range(len(times)):
                 f.write(f'{times[i]}\t{steps[i]}\t{mean[i]}\t{median[i]}\t{min[i]}\t{max[i]}\n')
 
-        if not only_stats:
+        if all_values:
 
             with open(filename, 'a') as f:
                 if isinstance(xy, list):
-                    f.write(_('Selected nodes'))
-                    f.write('X [m]\tY [m]')
+                    f.write(_('Selected nodes\n'))
+                    f.write('X [m]\tY [m]\n')
                     for cur in xy:
-                        f.write(f'{cur[0]}\t{cur[1]}')
+                        f.write(f'{cur[0]}\t{cur[1]}\n')
 
-                    f.write('\n')
+                    f.write('\n\n')
 
                 f.write(f'Time [s]\tStep [-]\t{which.value[0]}\n')
 

{wolfhece-2.1.120.dist-info → wolfhece-2.1.121.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wolfhece
-Version: 2.1.120
+Version: 2.1.121
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 License: Copyright (c) 2024 University of Liege. All rights reserved.
 Project-URL: Homepage, https://uee.uliege.be/hece

{wolfhece-2.1.120.dist-info → wolfhece-2.1.121.dist-info}/RECORD

@@ -7,7 +7,7 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
 wolfhece/PyConfig.py,sha256=gyl1MesSJZaVpC1XtvD78PpnE1VD3hGM3HPQXTJ3eJg,12963
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=f-5oxucK36sySu2_tCEbmyFdURd6J3DSrEF8xqdwE6A,565400
+wolfhece/PyDraw.py,sha256=6gFr4O-lGKCdv_bPtphkQf4uw7TcLbtUte6heSng4aI,565492
 wolfhece/PyGui.py,sha256=RlrLoCBdbiMnR4FSUD1yuy8fs--hxUl_zPu7zuduCLE,144706
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -58,15 +58,15 @@ wolfhece/wolf_texture.py,sha256=ecoXXmmcLuyG1oPqU2dB_k03qMTCLTVQoSq1xi1EalU,1735
 wolfhece/wolf_tiles.py,sha256=v-HohqaWuMYdn75XLnA22dlloAG90iwnIqrgnB0ASQ4,10488
 wolfhece/wolf_vrt.py,sha256=wbxXVN7TL9zgdyF79S-4e3pje6wJEAgBEfF_Y8kkzxs,14271
 wolfhece/wolf_zi_db.py,sha256=baE0niMCzybWGSvPJc5FNxo9ZxsGfU4p-FmfiavFHAs,12967
-wolfhece/wolfresults_2D.py,sha256=pCJW3F33sHAyVU_CLBpKVtya8Iyzq2WGaEtJ4mlimwU,203150
+wolfhece/wolfresults_2D.py,sha256=wf_FAT9Ozr8yaMzkNmxe238gJy5pzegZKnib47wjbnM,203343
 wolfhece/xyz_file.py,sha256=1pzLFmmdHca4yBVR9Jitic6N82rY28mRytGC1zMbY28,6615
 wolfhece/acceptability/Parallels.py,sha256=njrJFH_tTdQUg2px-QqQR6VdhImP1TEujLhpM3JEKNo,4001
 wolfhece/acceptability/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
 wolfhece/acceptability/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
-wolfhece/acceptability/acceptability.py,sha256=DJoUqbxHmXyYqXPrRH90QnFy_nDmrBhrTg0LtVxRlvc,28015
-wolfhece/acceptability/acceptability_gui.py,sha256=gBQDi9ZISWpwvJDrPxr4rsaDjBKwdmMQ_ES2P1wu-pk,72453
+wolfhece/acceptability/acceptability.py,sha256=dLsYVwPiYH33M7y2vVzlLVd9q8dLgDIeTuJ8f20L4ig,28006
+wolfhece/acceptability/acceptability_gui.py,sha256=AhIMnVlMPtqycbfeiDonJkjdlFOnvrBzBxXZobSIRJs,75633
 wolfhece/acceptability/cli.py,sha256=ul_GmDnSgKSgA7z5ZIzeA_MlS2uqo-Xi48bqmWUS-Qk,19141
-wolfhece/acceptability/func.py,sha256=aejpZYtfwaSo0jS07Rxi12PdPy4EoabV2O9xce3u4W0,68377
+wolfhece/acceptability/func.py,sha256=e-E73GFUAeqUy8j5HaA7GHnx12_gABCj0erWAtOqUfA,68241
 wolfhece/apps/ManageParams.py,sha256=9okXHGHKEayA9iKTnv8jsVYCP2up5kr6hDaKO_fMCaQ,748
 wolfhece/apps/Optimisation_hydro.py,sha256=ySIaVsFNEx4PaHFLlT2QW9BiwChVcTNd2TBnW1aICsI,810
 wolfhece/apps/WolfPython.png,sha256=K3dcbeZUiJCFNwOAAlGMaRGLJ56yM8WD2I_0bk0xT1g,104622
@@ -80,7 +80,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=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
-wolfhece/apps/version.py,sha256=EAXZrFQRQ0M2m5LHk88FVNaAWqGN7zZ8hoCJKWhlNRA,389
+wolfhece/apps/version.py,sha256=SejEJTdabn7XYNj2nJzbbaHqn21N_ZJvJU5tvR3AV-U,389
 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
@@ -295,8 +295,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.1.120.dist-info/METADATA,sha256=U-kyXjOMHrJjJ5Bc6GzMwerkoPEwXSEY43BLhZhrBa8,2587
-wolfhece-2.1.120.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-wolfhece-2.1.120.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.120.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.120.dist-info/RECORD,,
+wolfhece-2.1.121.dist-info/METADATA,sha256=2a93ri9fFZhGlUD2zDQ9Qo88Fy5awAfSpAFUjBudGZ8,2587
+wolfhece-2.1.121.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+wolfhece-2.1.121.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.121.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.121.dist-info/RECORD,,