|
@@ -222,7 +222,7 @@ class ProductionIndicatorAnalyst(AnalystNotFilter):
|
|
|
if Qp+Qdr==0:
|
|
|
Rdr=0
|
|
|
else:
|
|
|
- Rdr=Qdr/(Qp+Qdr)
|
|
|
+ Rdr=Qdr/(Qp+Qdr)*100
|
|
|
return Qp,Thc,Qdr,Rdr
|
|
|
def get_Ws(self,df,dataFrameGuaranteePowerCurve):
|
|
|
'''
|
|
@@ -312,7 +312,7 @@ class ProductionIndicatorAnalyst(AnalystNotFilter):
|
|
|
Qp, Thc, Qdr,Rdr = self.Production_indicators(dataFrameresults)
|
|
|
Qp=round(Qp,2)
|
|
|
Thc=round(Thc,2)
|
|
|
- Rdr = Rdr if Rdr is not None else 0
|
|
|
+ Rdr = round(Rdr,2) if Rdr is not None else 0
|
|
|
print("Rdr:",Rdr)
|
|
|
Qdr=round(Qdr,2)
|
|
|
# 将Qp, Thc, Rdr添加到results_df中
|