wolfhece 2.1.128__py3-none-any.whl → 2.2.1__py3-none-any.whl

wolfhece/hydrology/Comparison.py

@@ -12,8 +12,6 @@ import sys                              # module to stop the program when an err
 import os
 import matplotlib.pyplot as plt
 import numpy as np
-from numpy.__config__ import show
-from numpy.core.arrayprint import set_string_function
 from wx.core import DD_CHANGE_DIR
 
 from ..PyTranslate import _
@@ -419,10 +417,10 @@ class Comparison:
             tzPlot = plotDict["General Parameters"]["Time Zone Plot"]
             tzDelta = datetime.timedelta(hours=tzPlot)
 
-        if(envelop and not("Ref Name" in plotDict["General Parameters"])):
-            refName = "Catchment 1"
-        else:
-            refName = plotDict["General Parameters"]["Ref Name"]
+        # if(envelop and not("Ref Name" in plotDict["General Parameters"])):
+        #     refName = "Catchment 1"
+        # else:
+        #     refName = plotDict["General Parameters"]["Ref Name"]
 
         if(not("Add Table" in plotDict["General Parameters"])):
             addTable = False
@@ -524,7 +522,7 @@ class Comparison:
             yLabels = []
             if(not("Catchment traits" in plotDict["General Parameters"])):
                 myTraits = []
-            rain = []
+            rain = None
             z = []
             nbAddRain=0
             y_labelAddRain = []
@@ -587,7 +585,7 @@ class Comparison:
                             #     print("ERROR: the simulation time is not long enough for this subbasin to be taken into account")
                             #     sys.exit()
 
-                            cur_module:RetentionBasin = curCatch.retentionBasinDict["J18"]                            
+                            cur_module:RetentionBasin = curCatch.retentionBasinDict["J18"]
                             tmpHydro = cur_module.get_direct_insideRB_inlets(unit='m3/s')
 
                             y1.append(tmpHydro[:])
@@ -604,7 +602,7 @@ class Comparison:
                             # else:
                             #     print("ERROR: the simulation time is not long enough for this subbasin to be taken into account")
                             #     sys.exit()
-                            cur_module:RetentionBasin = curCatch.retentionBasinDict["J18"]                            
+                            cur_module:RetentionBasin = curCatch.retentionBasinDict["J18"]
                             tmpHydro = cur_module.get_direct_insideRB_inlets(unit='m3/s')
 
                             y1.append(tmpHydro[:])
@@ -721,7 +719,7 @@ class Comparison:
                             myTraits.append('-')
 
                         if(sameRain and displayRain):
-                            if(rain==[]):
+                            if(rain is None):
                                 rain = curCatch.subBasinDict[id].rain/curCatch.subBasinDict[id].surfaceDrainedHydro*3.6
                         elif(displayRain):
                             upperPlot = True
@@ -748,7 +746,7 @@ class Comparison:
                             myTraits.append('-')
 
                         if(sameRain and displayRain):
-                            if(rain==[]):
+                            if(rain is None):
                                 rain = curCatch.subBasinDict[id].rain/curCatch.subBasinDict[id].surfaceDrainedHydro*3.6
                         elif(displayRain):
                             upperPlot = True
@@ -801,7 +799,7 @@ class Comparison:
             if("Measures" in plotDict[basinNames[id]]):
                 Measures = plotDict[basinNames[id]]["Measures"]
                 myMeasure = Measures.myHydro
-                yLabels.append(_("Measures"))
+                yLabels.append(_("Measurement"))
                 catchColorsAddData.append('k')
                 myTraits.append('-')
                 if(Measures.surfaceDrainedHydro>0.0):
@@ -904,6 +902,11 @@ class Comparison:
         else:
             dt = plotDict["General Parameters"]["Dt"]
 
+        if(not("Add Table" in plotDict["General Parameters"])):
+            addTable = False
+        else:
+            addTable = plotDict["General Parameters"]["Add Table"]
+
         # if(envelop and not("Ref Name" in plotDict["General Parameters"])):
         #     refName = "Catchment 1"
 
@@ -1029,7 +1032,7 @@ class Comparison:
             if("Measures" in plotDict[RBNames[id]]):
                 Measures = plotDict[RBNames[id]]["Measures"]
                 myMeasure = Measures.myHydro
-                yLabels.append(_("Measures"))
+                yLabels.append(_("Measurement"))
                 catchColorsAddData.append('k')
                 myTraits.append('--')
             else:
@@ -1052,15 +1055,17 @@ class Comparison:
 
 
             # Plot Rains
-            yTitles = "Hauteurs d'eau [m]"
-            writeFileDef = writeFile + "_H_" + graph_title.replace(".","")
+            yTitles = _("Water level [m]")
+            writeFileDef = os.path.join(writeFile, "H_" + graph_title.replace(".",""))
             if(Measures is not None):
                 ph.plot_hydro(nbCatchment+nbAddData, y1,x_title=x_title, y_titles=yTitles, beginDate=beginDateRB+beginDateAddData,endDate=endDateRB+endDateAddData,dt=dt+dtAddData,graph_title=graph_title, \
                             y_labels=yLabels,rangeData=xRange,y_data_range=yRange,myColors=catchColors+catchColorsAddData,typeOfTraits=myTraits,writeFile=writeFileDef,\
-                            measures=myMeasure,beginDateMeasure=Measures.dateBegin+tzDelta, endDateMeasure=Measures.dateEnd+tzDelta,dtMeasure=Measures.deltaT,deltaMajorTicks=86400/2.0,deltaMinorTicks=3600)
+                            measures=myMeasure,beginDateMeasure=Measures.dateBegin+tzDelta, endDateMeasure=Measures.dateEnd+tzDelta,dtMeasure=Measures.deltaT,deltaMajorTicks=86400/2.0,deltaMinorTicks=3600,
+                            addTable=addTable)
             else:
                 ph.plot_hydro(nbCatchment+nbAddData, y1,x_title=x_title, y_titles=yTitles, beginDate=beginDateRB+beginDateAddData,endDate=endDateRB+endDateAddData,dt=dt+dtAddData,graph_title=graph_title, \
-                            y_labels=yLabels,rangeData=xRange,y_data_range=yRange,myColors=catchColors+catchColorsAddData,typeOfTraits=myTraits,writeFile=writeFileDef,deltaMajorTicks=86400/2.0,deltaMinorTicks=3600)
+                            y_labels=yLabels,rangeData=xRange,y_data_range=yRange,myColors=catchColors+catchColorsAddData,typeOfTraits=myTraits,writeFile=writeFileDef,deltaMajorTicks=86400/2.0,deltaMinorTicks=3600,
+                            addTable=addTable)
 
         if(show):
             plt.show()
@@ -1175,7 +1180,7 @@ class Comparison:
             yLabels = []
             if(not("Catchment traits" in plotDict["General Parameters"])):
                 myTraits = []
-            rain = []
+            rain = None
             z = []
             nbAddRain=0
             y_labelAddRain = []
@@ -1308,7 +1313,7 @@ class Comparison:
             if("Measures" in plotDict[RBNames[id]]):
                 Measures = plotDict[RBNames[id]]["Measures"]
                 myMeasure = Measures.myHydro
-                yLabels.append(_("Measures"))
+                yLabels.append(_("Measurement"))
                 catchColorsAddData.append('k')
                 myTraits.append('-')
                 if(Measures.surfaceDrainedHydro>0.0):
@@ -1387,7 +1392,7 @@ class Comparison:
 
 
 
-    def plot_all_diff_cumulRain_with_lagtime(self, interval, selection_by_iD=[], writeDir=""):
+    def plot_all_diff_cumulRain_with_lagtime(self, interval=0, selection_by_iD=[], writeDir=""):
 
         for idCatch in self.myCatchments:
             curCatch:Catchment = self.myCatchments[idCatch]['Object']
@@ -1405,13 +1410,13 @@ class Comparison:
     #         graph_title = curCatch.name + " :"
     #         cur_t, curVol = curCatch.get_all_cumulRain(selection_by_iD)
 
-    #     for 
+    #     for
     #         plt.figure()
     #         plt.title(graph_title)
     #         for i in range(len(curVol)):
     #             plt.plot(cur_t, curVol[i])
     #         plt.savefig(os.path.join(writeDir, graph_title))
-        
+
     #     if show : plt.show()
 
 
@@ -1529,10 +1534,7 @@ class Comparison:
         self.plotDict[stationKey]["Add Data"]["Dt"] = []
 
         for element in myAddDataObj:
-            if addDataUnits == "mm/h":
-                self.plotDict[stationKey]["Add Data"]["Data"].append(element.myHydro[:])
-            else:
-                self.plotDict[stationKey]["Add Data"]["Data"].append(element.myHydro[:]*element.surfaceDrained/3.6)
+            self.plotDict[stationKey]["Add Data"]["Data"].append(element.get_myHydro(unit=addDataUnits))
             self.plotDict[stationKey]["Add Data"]["Date Begin"].append(element.dateBegin)
             self.plotDict[stationKey]["Add Data"]["Date End"].append(element.dateEnd)
             self.plotDict[stationKey]["Add Data"]["Dt"].append(element.deltaT)
@@ -1578,34 +1580,34 @@ class Comparison:
         del self.plotDict[stationKey]["Add Data"]
 
 
-    
-    def plot_Nash_and_peak(self, stationKey:list[str, int], measures:list[SubBasin], intervals:list=[]):
+
+    def plot_Nash_and_peak(self, stationKey:list[str, int], measures:list[SubBasin], intervals:list=[], toShow:bool=True):
         assert len(stationKey) == len(measures)
 
-        all_ns = {stationKey[i]: [ self.myCatchments[el]["Object"].get_sub_Nash(measures[i], stationKey[i], intervals) 
-                    for el in self.myCatchments ] 
+        all_ns = {stationKey[i]: [ self.myCatchments[el]["Object"].get_sub_Nash(measures[i], stationKey[i], intervals)
+                    for el in self.myCatchments ]
                   for i in range(len(stationKey))
                 }
         print(all_ns)
 
-        all_peaks = [ [ self.myCatchments[el]["Object"].get_sub_peak(stationKey[i], intervals) 
-                        for el in self.myCatchments ] 
-                     for i in range(len(stationKey)) 
+        all_peaks = [ [ self.myCatchments[el]["Object"].get_sub_peak(stationKey[i], intervals)
+                        for el in self.myCatchments ]
+                     for i in range(len(stationKey))
                     ]
-        
+
         print(all_peaks)
 
-        meas_peak = [ measures[i].get_peak(intervals) 
+        meas_peak = [ measures[i].get_peak(intervals)
                      for i in range(len(stationKey)) ]
-        
+
         # The following lines is take the peak difference between simulation and measurements -> Display 0.0 if the measurement is 0.0
         isZero = np.array(meas_peak)==0
         notZero = np.array(meas_peak)!=0
-        peak_prop = {stationKey[i]: [ list( (np.array(el)-np.array(meas_peak[i]))/(np.array(meas_peak[i])+isZero[i]) *notZero[i] ) 
-                        for el in all_peaks[i] ] 
+        peak_prop = {stationKey[i]: [ list( (np.array(el)-np.array(meas_peak[i]))/(np.array(meas_peak[i])+isZero[i]) *notZero[i] )
+                        for el in all_peaks[i] ]
                      for i in range(len(stationKey))
                     }
-        
+
         print(meas_peak)
         print(peak_prop)
 
@@ -1633,7 +1635,7 @@ class Comparison:
                         continue
                     else:
                         colors_Nash[key][i_model].append("g")
-        
+
 
         colors_peaks = {}
         for key, value in peak_prop.items():
@@ -1656,15 +1658,15 @@ class Comparison:
         all_names = ["\n - \n".join([cdate[0].strftime("%d/%m/%Y"), cdate[1].strftime("%d/%m/%Y")]) for cdate in intervals]
 
 
-        ## Plot 
+        ## Plot
         nb_stations = len(stationKey)
         type_of_model = [self.myCatchments[el]["Title"] for el in self.myCatchments]
         type_of_data = ["Nash", r"$  \frac{Q^{s}_{max}-Q^{m}_{max}}{Q^{m}_{max}} $ "]
         type_of_data_names = ["Nash", "Exceedance"]
 
-        ph.bar_Nash_n_other(all_data, all_colors, nb_x=len(intervals), nb_data=len(type_of_model), nb_lines=nb_stations, 
-                            y_titles=type_of_data, x_titles=all_names, nameModel=type_of_model, line_names=sorted_keys, toShow=False)
-        
+        # ph.bar_Nash_n_other(all_data, all_colors, nb_x=len(intervals), nb_data=len(type_of_model), nb_lines=nb_stations,
+        #                     y_titles=type_of_data, x_titles=all_names, nameModel=type_of_model, line_names=sorted_keys, toShow=False)
+
         # =========
         # =========
         # Plot tables - 2nd version with the table instead of bars
@@ -1676,12 +1678,12 @@ class Comparison:
         all_peaks = {cur_catch["Title"]: np.array([cur_catch["Object"].get_sub_peak(stationKey[i], intervals) for i in range(len(stationKey))])
                      for cur_catch in self.myCatchments.values()
         }
-        
+
         print(all_peaks)
 
-        meas_peak = np.array([ measures[i].get_peak(intervals) 
+        meas_peak = np.array([ measures[i].get_peak(intervals)
                      for i in range(len(stationKey)) ])
-        
+
         # The following lines is take the peak difference between simulation and measurements -> Display 0.0 if the measurement is 0.0
         isZero = (meas_peak==0)
         notZero = (meas_peak!=0)
@@ -1692,13 +1694,13 @@ class Comparison:
 
         # Concatenate all data
         all_data = [all_ns, peak_prop]
-        
+
         for data, name_of_data in zip(all_data, type_of_data_names):
             for cur_model, cur_data in data.items():
                 file_name = os.path.join(self.workingDir, name_of_data+"_"+cur_model)+".png"
                 # cur_title = cur_model + ": " + name_of_data
-                ph.table_Nash_n_other(cur_data, name_of_data, 
-                                    row_names=sorted_keys, column_names=all_names, 
+                ph.table_Nash_n_other(cur_data, name_of_data,
+                                    row_names=sorted_keys, column_names=all_names,
                                     writeFile=file_name, toShow=False)
-
-        plt.show()
+        if toShow:
+            plt.show()