Ver código fonte

解决 trs、cp分别与功率、风速分析的 无穷大值问题

zhouyang.xie 1 mês atrás
pai
commit
8b9fbd0aef

+ 4 - 2
dataAnalysisBusiness/algorithm/cpAnalyst.py

@@ -225,7 +225,8 @@ class CpAnalyst(AnalystWithGoodPoint):
                     "engineName": tempTurbineInfo[Field_NameOfTurbine],
                     "engineCode": other_name,
                     "xData": other_group[Field_PowerFloor].tolist(),
-                    "yData": other_group[Field_CpMedian].tolist(),
+                    # "yData": other_group[Field_CpMedian].tolist(),
+                    "yData": [None if math.isinf(val) else val for val in other_group[Field_CpMedian].tolist()],
                 }
                 turbine_data_list_each.append(turbine_data_other_each)
 
@@ -240,7 +241,8 @@ class CpAnalyst(AnalystWithGoodPoint):
                 "engineName": currTurbineInfo[Field_NameOfTurbine],
                 "engineCode": currTurbineInfo[Field_CodeOfTurbine],
                 "xData": group[Field_PowerFloor].tolist(),
-                "yData": group[Field_CpMedian].tolist(),
+                # "yData": group[Field_CpMedian].tolist(),
+                "yData": [None if math.isinf(val) else val for val in group[Field_CpMedian].tolist()],
             }
             turbine_data_list_each.append(turbine_data_curr)
 

+ 2 - 1
dataAnalysisBusiness/algorithm/cpWindSpeedAnalyst.py

@@ -183,7 +183,8 @@ class CpWindSpeedAnalyst(AnalystWithGoodPoint):
                     "engineName": tempTurbineInfo[Field_NameOfTurbine],
                     "engineCode": turbineCode,
                     "xData": tempDataFrame[Field_WindSpeedFloor].tolist(),
-                    "yData": tempDataFrame[Field_Cp].tolist(),
+                    # "yData": tempDataFrame[Field_Cp].tolist(),
+                    "yData": [None if math.isinf(val) else val for val in tempDataFrame[Field_Cp].tolist()],
                 }
                 turbine_data_list_each.append(turbine_data_other_each)
 

+ 2 - 1
dataAnalysisBusiness/algorithm/tsrAnalyst.py

@@ -262,7 +262,8 @@ class TSRAnalyst(AnalystWithGoodPoint):
                     "engineName": turbine,
                     "engineCode": turbine_data[Field_CodeOfTurbine].iloc[0],
                     "xData": turbine_data[x_name].tolist(),
-                    "yData": turbine_data[y_name].tolist(),
+                    # "yData": turbine_data[y_name].tolist(),
+                    "yData": [None if math.isinf(val) else val for val in turbine_data[y_name].tolist()],
                 }
                 turbine_data_list_each.append(turbine_data_each)
 

+ 2 - 1
dataAnalysisBusiness/algorithm/tsrWindSpeedAnalyst.py

@@ -281,7 +281,8 @@ class TSRWindSpeedAnalyst(AnalystWithGoodPoint):
                     "engineName": turbine,
                     "engineCode": turbine_data[Field_CodeOfTurbine].iloc[0],
                     "xData": turbine_data[x_name].tolist(),
-                    "yData": turbine_data[y_name].tolist(),
+                    # "yData": turbine_data[y_name].tolist(),
+                    "yData": [None if math.isinf(val) else val for val in turbine_data[y_name].tolist()],
                 }
                 turbine_data_list_each.append(turbine_data_each)