wolfhece 2.0.16__py3-none-any.whl → 2.0.18__py3-none-any.whl

wolfhece/bernoulli/ReadNeupotzData.py

@@ -1,223 +0,0 @@
-
-def Read_File(filename,filename_out,filename_resume,filename_period,Aggreg_Hours):
-#out_file = open(filename_out,'w')
-    file = open(filename,'r')
-    file_out = open(filename_out,'w')
-    Value_Q=[]
-    Value_Hour=[]
-    cpt_val=0
-    First_NewDay=0
-    Good_Period=True
-    Cur_Value=0
-    for New_Word in file:
-        #Extraction des différentes données utiles : heure, valeurs
-        New_Word=New_Word.split()
-        #Selon numéro de l'élément, on sait ce que cela représente
-        #Analyse pour extraire minutes
-        if(bool(New_Word)):
-            Day=New_Word[0].split('.')
-            Date=New_Word[1].split(':')
-            Hour=int(Date[0])
-            Hour_f=float(Date[0])
-            New_Word[4]=New_Word[4].replace(",", ".")
-            if(Day[2]=='2020' and Day[1]=='01' and Day[0]=='09' and Hour>12):
-                Good_Period=False
-            New_Improve=True
-            if(Good_Period):
-                New_Value=float(New_Word[4])
-                #if(New_Value<-5):
-                #    New_Value=Cur_Value
-                if(cpt_val>0):
-                    New_Day=int(Date[0])
-                    New_Minute=int(Date[1])
-                    if(New_Day==Old_Day):
-                        Diff_Day=New_Minute-Old_Minute
-                    else:
-                        Old_Minute=60-Old_Minute
-                        Diff_Day=Old_Minute+New_Minute
-                        Old_Day=New_Day
-                        if(First_NewDay==0):
-                            Hour_Val=int(Date[0])
-                            if(Hour_Val==0):
-                                PosNewDay=len(Value_Q) #On commence le comptage au début de la première nouvelle journée
-                                First_NewDay=1
-                        else:
-                            if(First_NewDay==1):
-                                PosLastDay=len(Value_Q)
-                                if(PosLastDay==1037):
-                                    Test=1
-                                DiffDay=PosLastDay-PosNewDay
-                                Mod=DiffDay%60
-                                if(Mod>0):
-                                    Test=1
-                    if(Diff_Day==1):
-                        Value_Q.append(New_Value)
-                        Value_Hour.append(Hour_f)
-                        Cur_Value=New_Value
-                    else:
-                        Added_V=(Cur_Value+New_Value)/2.0
-                        New_Improve=False
-                        for Min in range(Diff_Day):
-                            Sentence=Day[0]+','+Day[1]+','+Date[0]+','+Date[1]+','+New_Word[4]+'\n'
-                            file_out.write(Sentence)
-                            Value_Q.append(Cur_Value)
-                            Value_Hour.append(Hour_f)
-                    Old_Minute=New_Minute
-
-                else:
-                    Value_Q.append(New_Value)
-                    Value_Hour.append(Hour_f)
-                    Old_Minute=int(Date[1])
-                    Old_Day=int(Date[0])
-                    Cur_Value=New_Value
-
-            cpt_val+=1
-            if(New_Improve):
-                Sentence=Day[0]+','+Day[1]+','+Date[0]+','+Date[1]+','+New_Word[4]+'\n'
-                file_out.write(Sentence)
-    file.close()
-    file_out.close()
-    IERR=0
-    #On va analyser le nombre de journées : on commence première journée à minuit pour terminer aussi à minuit
-    NbHour=(PosLastDay-PosNewDay)/60
-    Mod=NbHour%24
-    NbElem=Mod*60
-    PosLastDay=PosLastDay-NbElem
-    NbHour=int((PosLastDay-PosNewDay)/60)
-    NbDays=int(NbHour/24)
-    #On évalue alors l'évolution des données selon durée choisie par l'utilisateur
-    Nb_Period=int((PosLastDay-PosNewDay)/Time)
-
-    ID_Pos=PosNewDay
-    Value_P=[]
-    Period_P=[]
-    Period_Hour=[]
-    Pos_P=[]
-    filename_period=filename_period+str(Time)+'min.txt'
-    file_out = open(filename_period,'w')
-    cpt_pos=0
-    Prev_P=0
-    for Id_Period in range(Nb_Period):
-        Moy_P=sum(Value_Q[ID_Pos:ID_Pos+Time])/Time
-        Moy_Hour=sum(Value_Hour[ID_Pos:ID_Pos+Time])/Time
-        #Certaines données incohérentes sont observées durant la nuit : on vient donc évaluer plutôt récupérer une valeur précédente
-        if(cpt_pos==2455):
-            Test=2
-        if(Moy_P<-5):
-            Moy_P=Prev_P
-        Test=1
-        Value_P.append(Moy_Hour)
-        Prev_P=Moy_P
-        #On exporte la valeur à chaque nouvelle période de temps
-        Sum_P=Moy_P*Time
-        #Sum_Hour=Moy_Hour*Time
-        cpt_pos+=1
-        Period_P.append(Sum_P)
-        Pos_P.append(ID_Pos)
-        #Period_Hour.append(Sum_Hour)
-        ID_Pos+=Time
-        Sentence=str(Sum_P)+'\n'
-        file_out.write(Sentence)
-
-    file_out.close()
-    #On évalue ensuite la variance selon chaque période
-    ID_Pos=PosNewDay
-    STD_P=[]
-    for Id_Period in range(Nb_Period):
-        Var_P=0
-        for El in range(Time):
-            Var_P+=(Value_Q[ID_Pos+El]-Value_P[Id_Period])**2.0/float(Time)
-        Var_P=Var_P**0.5
-        ID_Pos+=Time
-        STD_P.append(Var_P)
-    #On va également obtenir la distribution selon la journée
-    Nb_Elem=int(60*24/Time)
-    Elem_Var=[]
-    for ID_Elem in range(Nb_Elem):
-        Elem_Var.append([])
-    for ID_Day in range(NbDays):
-        for ID_Elem in range(Nb_Elem):
-            Elem_Var[ID_Elem].append(Value_P[ID_Elem+ID_Day*Nb_Elem])
-            Test=1
-        Test=1
-    #On trie les listes
-    for ID_Elem in range(Nb_Elem):
-        Elem_Var[ID_Elem]=sorted(Elem_Var[ID_Elem])
-    #On vient récupérer valeur médiane
-    Perc=[0.5,0.05,0.95]
-    PosEl=[]
-    for Position in Perc:
-        PosEl.append(int(Position*NbDays))
-    Val_El=[]
-    filename_resume=filename_resume+str(Time)+'min.txt'
-    file = open(filename_resume,'w')
-    for ID_Elem in range(Nb_Elem):
-        Mean_Val=sum(Elem_Var[ID_Elem])/NbDays
-        Val_El.append([])
-        Val_El[ID_Elem].append(Mean_Val)
-        Sentence=str(Mean_Val)
-        for Perc_Pos in PosEl:
-            Val_El[ID_Elem].append(Elem_Var[ID_Elem][Perc_Pos])
-            Sentence+=','
-            Sentence+=str(Elem_Var[ID_Elem][Perc_Pos])
-        Sentence+='\n'
-        file.write(Sentence)
-        file.write(Sentence)
-    file.close()
-    return Period_P,Value_P,Pos_P
-
-def Write_File_Demand(file_demand,Period_Neupotz,Period_Leimer,Period_Hour,Pos_Period,Time):
-    file_demand1=file_demand+str(Time)+'min.txt'
-    file_out = open(file_demand1,'w')
-    file_demand2=file_demand+'Neupotz_Upd_'+str(Time)+'min.txt'
-    file_out2 = open(file_demand2,'w')
-    file_demand3=file_demand+'LeimerUpd_'+str(Time)+'min.txt'
-    file_out3 = open(file_demand3,'w')
-    file_demand4=file_demand+'Bad_Period.txt'
-    file_out4 = open(file_demand4,'w')
-    Bad_Periods=0 #Period where the water demand that is available is lower than 0
-    Bad_Periods2=0
-    for ID_Period in range(len(Period_Neupotz)):
-        Avail_Water=Period_Neupotz[ID_Period]+Period_Leimer[ID_Period]
-        if(Avail_Water<0):
-            Bad_Periods+=1
-            if(Period_Hour[ID_Period]>7 and Period_Hour[ID_Period]<22):
-                Test=3
-                Bad_Periods2+=1
-            #On vient assurer la continuité
-            Period_Neupotz[ID_Period]=Period_Neupotz[ID_Period]-Avail_Water/2
-            Period_Leimer[ID_Period]=Period_Leimer[ID_Period]-Avail_Water/2
-            Sentence4=str(Period_Hour[ID_Period])+str(Pos_Period[ID_Period])+'\n'
-            Avail_Water=0
-            file_out4.write(Sentence4)
-
-        Sentence=str(Avail_Water)+'\n'
-        Sentence2=str(Period_Neupotz[ID_Period])+'\n'
-        Sentence3=str(Period_Leimer[ID_Period])+'\n'
-        file_out.write(Sentence)
-        file_out2.write(Sentence2)
-        file_out3.write(Sentence3)
-    file_out.close()
-    file_out2.close()
-    file_out3.close()
-    file_out4.close()
-    IERR=0
-    return IERR
-
-#Analyse injection Neupotz
-filename='D:\\PIRARD_Thomas\\Reseau_Jockgrim\\FlowmetersData\\FlowSensorData\\NeupotzData.txt'
-filename_out='D:\\PIRARD_Thomas\\Reseau_Jockgrim\\FlowmetersData\\FlowSensorData\\NeupotzData_Improved.txt'
-filename_resume='D:\\PIRARD_Thomas\\Reseau_Jockgrim\\FlowmetersData\\FlowSensorData\\Neupotz_Resume_'
-filename_period='D:\\PIRARD_Thomas\\Reseau_Jockgrim\\FlowmetersData\\FlowSensorData\\Neupotz_Periods_'
-Time=60
-Period_Neupotz,Period_Hour_Neupotz,Pos_Period_Neu=Read_File(filename,filename_out,filename_resume,filename_period,Time)
-#Analyse injection Leimer
-filename='D:\\PIRARD_Thomas\\Reseau_Jockgrim\\FlowmetersData\\FlowSensorData\\LeimerData.txt'
-filename_out='D:\\PIRARD_Thomas\\Reseau_Jockgrim\\FlowmetersData\\FlowSensorData\\LeimerData_Improved.txt'
-filename_resume='D:\\PIRARD_Thomas\\Reseau_Jockgrim\\FlowmetersData\\FlowSensorData\\Leimer_Resume_'
-filename_period='D:\\PIRARD_Thomas\\Reseau_Jockgrim\\FlowmetersData\\FlowSensorData\\Leimer_Periods_'
-Period_Leimer,Period_Hour_Leimer,Pos_Period_Lei=Read_File(filename,filename_out,filename_resume,filename_period,Time)
-#Récupération information sur eau disponible sur utilisateurs
-file_demand='D:\\PIRARD_Thomas\\Reseau_Jockgrim\\FlowmetersData\\FlowSensorData\\Demand_Periods_'
-IERR=Write_File_Demand(file_demand,Period_Neupotz,Period_Leimer,Period_Hour_Neupotz,Pos_Period_Lei,Time)
-Test=1

wolfhece/bernoulli/opti_results_interactive_plot.py

@@ -1,212 +0,0 @@
-# %% Libraries
-import sys
-import csv
-import numpy as np
-import matplotlib.pyplot as plt
-# Import slider package
-from matplotlib.widgets import Slider
-
-# ===================================================================================
-#                                 PARAMETERS
-# ===================================================================================
-
-
-# %% Parameters
-
-# Parameter to display   -> TO CHANGE BEFORE SIMULATION
-# 0: X1,    1: X2,      2: X3,      3: X4   
-id1_fixed = 0   # parameter to tune 1
-id2_fixed = 3   # parameter to tune 2
-id1 = 1     # parameter on the x axis
-id2 = 2     # parameter on the y axis
-
-
-# File name
-# dirName = "F:/Christophe/Simulations/Optimisation/Screening_GR4/10_13/"
-#dir_path = os.path.dirname(os.path.realpath(__file__))
-#dirName = dir_path + "/Opti_GR4_25Params/"
-dirName = "D:/PIRARD_Thomas/Opti_GR4_25Params/"
-fileName = "example.rpt"
-
-# Nomber of parameters
-nbParams = 4
-
-# Steps for each parameter
-dx1 = 3
-dx2 = 0.2
-dx3 = 8
-dx4 = 1.6
-dx = [dx1, dx2, dx3, dx4]
-
-# Range for each parameter
-p_min = [75, -5, 100, 10]
-p_max = [150, 0, 300, 45]
-
-# Label of parameters
-my_labels = ["X1 [mm]", "X2 [mm/hour]", "X3 [mm]", "X4 [hour]"]
-my_labelsSlider = ["X1 ", "X2 ", "X3 ", "X4 "]
-my_valfmt = ["%3.1f [mm]", "%1.1f [mm/hour]", "%3.1f [mm]", "%2.1f [hour]"]
-
-# Number of simulations
-nbSimul = 13
-
-
-
-
-
-
-# ===================================================================================
-#                                 FUNCTIONS
-# ===================================================================================
-
-def get_Nash(i1: int, P1: float, i2: int, P2: float, xi: int, yi:int) -> float:
-    Dx = []
-    for i in range(nbEl):
-        if(matrixData[i][i1]==P1 and matrixData[i][i2]==P2):
-            if Dx == []:
-                Dx = [matrixData[i,:]]
-            else:
-                Dx = np.vstack([Dx, matrixData[i,:]])
-
-    xMax = 0.0
-    xMin = 0.0
-    yMin = 0.0
-    yMax = 0.0
-
-    xMax = np.max(Dx[:,xi])
-    xMin = np.min(Dx[:,xi])
-    x = np.arange(xMin,xMax+dx[xi],dx[xi])
-    yMin = np.min(Dx[:,yi])
-    yMax = np.max(Dx[:,yi])
-    y = np.arange(yMin,yMax+dx[yi],dx[yi])
-
-    n = len(Dx[:,0])
-    Nash = np.zeros((len(y),len(x)))
-    for i in range(n):
-        tmp_ix = (Dx[i][xi]-xMin)/dx[xi]
-        tmp_iy = (Dx[i][yi]-yMin)/dx[yi]
-        if(tmp_ix%1>0.00001 and tmp_ix%1<0.99999 and tmp_iy%1>0.00001 and tmp_iy%1<0.99999):
-            print("Potential error, please check!")
-            sys.exit()
-        else:
-            ix = int(round(tmp_ix))
-            iy = int(round(tmp_iy))
-        Nash[iy][ix] = Dx[i][4]
-
-    return Nash, xMin,xMax,yMin,yMax
-
-
-# Update values
-def update(val):
-    curX2 = round(s_X2.val,1)
-    curX4 = round(s_X4.val,1)
-    Nash,xMin,xMax,yMax,yMin = get_Nash(id1_fixed,curX2,id2_fixed,curX4,id1,id2)
-    # f_d, = [ax.imshow(Nash, interpolation='None', extent=[xMin,xMax,yMax,yMin], aspect='auto')]
-    # cbar.draw_all()
-    # cbar = fig.colorbar(f_d,ax=ax)
-    f_d.set_data(Nash)
-    f_d.set_clim(vmin=Nash.min(), vmax=Nash.max())
-    fig.canvas.draw_idle()
-
-
-
-
-# %% Reading of the file(s)
-list_data = []
-for simul in range(nbSimul):
-    # data_reader = []
-    fileAccess = dirName + str(simul+1) + "_" + str(nbSimul) + "/" + fileName
-    with open(fileAccess, newline='') as fileID:
-        data_reader = []
-        data_reader = csv.reader(fileID,delimiter='|')       
-        i=0
-        for raw in data_reader:
-            if i>2:
-                list_data.append(raw)
-            i += 1
-        
-
-nbEl = len(list_data[:]) - nbSimul    # - nbSimul because the last line of each file is composed of only '*'
-matrixData = np.zeros((nbEl,nbParams+1))
-counter = 0
-for i in range(len(list_data[:])): 
-    if len(list_data[i]) != nbParams+1+3:
-        if(len(list_data[i])==1 and list_data[i][0][0] == '*'):
-            continue
-        else:
-            print("ERROR: Something went wrong with the number of elements in the input file!")
-            sys.exit()
-    for j in range(nbParams+1):
-        matrixData[counter][j] = float(list_data[i][2+j].strip())
-    counter += 1
-
-
-# %% Best parameters
-best_NS = np.max(matrixData[:,4])
-min_NS = np.min(matrixData[:,4])
-i_bNS = np.argmax(matrixData[:,4])
-i_mNS = np.argmin(matrixData[:,4])
-print("Best parameters : ", matrixData[i_bNS,:-1])
-print("Best Nash = ", matrixData[i_bNS,-1])
-bX1 = matrixData[i_bNS][0]
-bX2 = matrixData[i_bNS][1]
-bX3 = matrixData[i_bNS][2]
-bX4 = matrixData[i_bNS][3]
-
-best_param = [bX1, bX2, bX3, bX4]
-
-
-# %% ----- Interactive plot -----
-
-# %% Construct plane (X1,X3) with variable parameters X2 & X4
-
-
-# Create main axis
-fig = plt.figure(figsize=(6, 4))
-ax = fig.add_subplot(111)
-fig.subplots_adjust(bottom=0.2, top=0.75)
-
-
-# Create axes for sliders
-
-ax_T = fig.add_axes([0.3, 0.92, 0.4, 0.05])
-ax_T.spines['top'].set_visible(True)
-ax_T.spines['right'].set_visible(True)
-
-ax_Ef = fig.add_axes([0.3, 0.85, 0.4, 0.05])
-ax_Ef.spines['top'].set_visible(True)
-ax_Ef.spines['right'].set_visible(True)
-
-
-
-# Create sliders
-s_X2 = Slider(ax=ax_T, label=my_labelsSlider[id1_fixed], valmin=p_min[id1_fixed], valmax=p_max[id1_fixed], valstep=dx[id1_fixed],valinit=best_param[id1_fixed], valfmt=my_valfmt[id1_fixed], facecolor='#cc7000')
-s_X4 = Slider(ax=ax_Ef, label=my_labelsSlider[id2_fixed],valmin=p_min[id2_fixed], valmax=p_max[id2_fixed], valstep=dx[id2_fixed],valinit=best_param[id2_fixed], valfmt=my_valfmt[id2_fixed], facecolor='#cc7000')
-
-
-# Plot default data
-Nash = []
-# x = np.linspace(-0, 1, 100)
-X2_0 = best_param[id1_fixed]
-X4_0 = best_param[id2_fixed]
-Nash,xMin,xMax,yMax,yMin = get_Nash(id1_fixed,X2_0,id2_fixed,X4_0,id1,id2)
-# f_d, = ax.imshow(Nash, interpolation='None', extent=[xMin,xMax,yMax,yMin], aspect='auto')
-f_d, = [ax.imshow(Nash, interpolation='None', extent=[xMin,xMax,yMin,yMax], aspect='auto')]
-ax.set_xlabel(my_labels[id1])
-ax.set_ylabel(my_labels[id2])
-cbar = fig.colorbar(f_d,ax=ax)
-# f_d, = ax.plot(x, y, linewidth=2.5)
-
-s_X2.on_changed(update)
-s_X4.on_changed(update)
-
-
-
-    
-
-plt.show()
-
-t=1
-# import pickle
-# pickle.dump(fig, open('FigureObject.fig.pickle', 'wb')) # This is for Python 3 - py2 may need `file` instead of `open`
-

wolfhece/debug.py

@@ -1,8 +0,0 @@
-from .PyVertex import wolfvertex
-
-my=wolfvertex(1.0,2.0,3.0)
-c=my.coords
-
-c[0]=3.
-d=my.coords
-print(my.x,c[0],d[0])