소스 검색

awg commit algorithm components

anweiguo 4 달 전
부모
커밋
f5c2bc1670
2개의 변경된 파일5개의 추가작업 그리고 2개의 파일을 삭제
  1. 4 1
      data_processing/data_operation/data_join.py
  2. 1 1
      evaluation_processing/analysis_report.py

+ 4 - 1
data_processing/data_operation/data_join.py

@@ -18,7 +18,10 @@ def hello():
 def  data_merge(df_list, args):
     join_key,join_type,features = args['join_key'], args['join_type'], str_to_list(args['col_reserve'])
     result = reduce(lambda left, right: pd.merge(left, right, how=join_type, on=join_key), df_list)
-    return result[features]
+    if len(features)==0:
+        return result
+    else:
+        return result[features]
 
 
 @app.route('/data_join', methods=['POST'])

+ 1 - 1
evaluation_processing/analysis_report.py

@@ -85,7 +85,7 @@ def put_analysis_report_to_html(args, df_clean, df_predict, df_accuracy):
             font=dict(size=12)  # 图例文字大小
         ),
         title=dict(
-            text='实际功率与辐照度的散点图',  # 图表标题
+            # text='实际功率与辐照度的散点图',  # 图表标题
             x=0.5,  # 标题居中
             font=dict(size=16)  # 标题字体大小
         ),