diff --git a/tools/evaluation/thesisCoupled.py b/tools/evaluation/thesisCoupled.py index 6d385d2e9e3ba545609be9354d8e55605239aa35..505957d0fe37a836bb75b592a65a675e8795e53b 100644 --- a/tools/evaluation/thesisCoupled.py +++ b/tools/evaluation/thesisCoupled.py @@ -247,7 +247,7 @@ def MechTimeStepTestTable(): plt.legend(bbox_to_anchor=(1.05,1.00), loc="upper left") plt.xlabel('Zeit (s)') plt.ylabel('Volumen (ml)') - plt.show() + #plt.show() #read.writeVolumeDataInFile(fMech0016,lL,tL,1) #read.writeDataInFile(fMech0008,lL,tL,1) #read.writeDataInFile(fMech0016,lL,tL,1) @@ -258,8 +258,8 @@ def MechTimeStepTestTable(): savePath='../../../thesis-lindner/thesis/tables/erstmal/coupled/' tabWriter = TableWriter(lL,tL,sdt,endTime,1,[fSIOC],listEvaluationPoints) - #for p in listEvaluationPoints: - #tabWriter.writeMechTimeStepTestTable(l,p,fL,nL,threshold,savePath) + for p in listEvaluationPoints: + tabWriter.writeMechTimeStepTestTable(l,p,fL,nL,threshold,savePath) plot=Plot(lL,tL,sdt,endTime,1,listEvaluationPoints) #plot.volumesDifferentAlgs(nL,fL,l.j,) @@ -500,7 +500,7 @@ if __name__=="__main__": #ErrorExtraVInt(case) diffcase='Ca' #DifferencePerPointTabs(diffcase) - ErrorExtraAndInt(case) + #ErrorExtraAndInt(case) ######################## #gamma_f ################################ @@ -524,7 +524,7 @@ if __name__=="__main__": ################################ #MechTimeStep listEvaluationPoints ################################## - #MechTimeStepTestTable() + MechTimeStepTestTable() ###################################### diff --git a/tools/evaluation/utility/latexTables.py b/tools/evaluation/utility/latexTables.py index f1df733bf7ab1fa1b7cd04375ec78d5a14363e5b..4fdde8f2c30457e7516cbd3b4dc75049a84f45ff 100644 --- a/tools/evaluation/utility/latexTables.py +++ b/tools/evaluation/utility/latexTables.py @@ -2351,19 +2351,19 @@ class Table: block+=" & - " block+='\\\\[2pt]\n' - #Gamma IntV: - block+='&$\\errorGAct^{'+str(j)+','+str(l)+','+str(p)+'}$' - for alg in fL: - (t,V)=read.getDataFromTXT(alg,read.createFilename(l,j,self.m)+'Gamma',p) - if len(t)==standardlength-1: - (tact,id_tact)=comp.getTactPerCase(t,V,thG,'Gamma',True) - id_dur=self.getTimeID(id_tact,j) - value=comp.L2DiffInterval(V[id_tact:id_dur],GInt_full,self.sdt,j,j_refGInt-1,p) - value=value/normG_full - block += " & $"+ str("%8.4f"%(value))+"$" - else: - block+=" & - " - block+='\\\\[2pt]\n' + ##Gamma IntV: + #block+='&$\\errorGAct^{'+str(j)+','+str(l)+','+str(p)+'}$' + #for alg in fL: + #(t,V)=read.getDataFromTXT(alg,read.createFilename(l,j,self.m)+'Gamma',p) + #if len(t)==standardlength-1: + #(tact,id_tact)=comp.getTactPerCase(t,V,thG,'Gamma',True) + #id_dur=self.getTimeID(id_tact,j) + #value=comp.L2DiffInterval(V[id_tact:id_dur],GInt_full,self.sdt,j,j_refGInt-1,p) + #value=value/normG_full + #block += " & $"+ str("%8.4f"%(value))+"$" + #else: + #block+=" & - " + #block+='\\\\[2pt]\n' #LV: