From 3fa385170759d6e63b28851b5ea143d7720ce2db Mon Sep 17 00:00:00 2001 From: Zhao Zuohong Date: Mon, 14 Aug 2023 16:27:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B3=E7=94=B5=E7=AB=99=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/riic_report_analysis.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/apps/riic_report_analysis.py b/apps/riic_report_analysis.py index 61fca51..029bb75 100644 --- a/apps/riic_report_analysis.py +++ b/apps/riic_report_analysis.py @@ -149,8 +149,17 @@ class RIICReportAnalysis: total_by_order = lmb_avg + balanced_exp_by_order output += "====计算结果====\n\n" - output += f"订单平均：{lmb_avg:.0f}\n\n" - output += "-----效率算法-----\n" + output += f"订单平均：{lmb_avg:.0f}\n" + if power_plants == 3: + output += f"赤金平均：{gold_avg:.0f}\n" + output += f"经验平均：{exp_avg:.0f}\n" + if exp_avg != 0: + output += f"产出钱书比例：{lmb_avg / exp_avg:.2f}\n" + else: + output += f"产出钱书比例：正无穷\n" + output += f"综合钱书比例：{(lmb_avg + external_lmb) / (exp_avg + external_exp):.2f}\n" + output += f"钱书总和：{lmb_avg + exp_avg:.0f}\n" + output += "\n-----效率算法-----\n" output += f"贸易效率：{trading_efficiency * 100:.0f}%\n" output += f"等效赤金：{gold_by_e:.0f}\n" output += f"经验调平：{balanced_exp_by_e:.0f}\n" @@ -163,8 +172,6 @@ class RIICReportAnalysis: if power_plants == 2: output += f"钱书比例：{lmb_exp_ratio_by_order:.2f}\n" output += f"调平总和：{total_by_order:.0f}\n\n" - if power_plants == 3: - output += f"钱书比例：{(lmb_avg + external_lmb) / (exp_avg + external_exp):.2f}" else: balanced_gold = lmb_avg - external_gold overflow_gold = gold_avg - balanced_gold