diff --git a/weex/读取数据库分析数据2.0.py b/weex/读取数据库分析数据2.0.py index d39b74b..7e1f139 100644 --- a/weex/读取数据库分析数据2.0.py +++ b/weex/读取数据库分析数据2.0.py @@ -180,17 +180,17 @@ if __name__ == '__main__': total_profit = sum(t['diff'] / t['entry'] * 10000 for t in trades) total_fee = sum(5 + 10000 / t['entry'] * t['exit'] * 0.0005 for t in trades) - # logger.info("===== 每笔交易详情 =====") - # for t in trades: - # logger.info(f"{t['entry_time']} {t['direction']}({t['signal']}) " - # f"入场={t['entry']:.2f} 出场={t['exit']:.2f} 出场时间={t['exit_time']} " - # f"差价={t['diff']:.2f}") + logger.info("===== 每笔交易详情 =====") + for t in trades: + logger.info(f"{t['entry_time']} {t['direction']}({t['signal']}) " + f"入场={t['entry']:.2f} 出场={t['exit']:.2f} 出场时间={t['exit_time']} " + f"差价={t['diff']:.2f}") - # print(i1, i) - # print(f"\n一共交易笔数:{len(trades)}") - # print(f"一共盈利:{total_profit:.2f}") - # print(f"一共手续费:{total_fee:.2f}") - # print(f"净利润:{total_profit - total_fee:.2f}") + print(i1, i) + print(f"\n一共交易笔数:{len(trades)}") + print(f"一共盈利:{total_profit:.2f}") + print(f"一共手续费:{total_fee:.2f}") + print(f"净利润:{total_profit - total_fee:.2f}") if total_profit > total_fee * 0.1: print(i1, i) @@ -200,6 +200,8 @@ if __name__ == '__main__': print(f"净利润:{total_profit - total_fee * 0.1}") print("\n===== 信号统计 =====") - # for k, v in stats.items(): - # win_rate = (v['wins'] / v['count'] * 100) if v['count'] > 0 else 0 - # print(f"{v['name']} ({k}) - 信号数: {v['count']} | 胜率: {win_rate:.2f}% | 总盈利: {v['total_profit']:.2f}") + + for k, v in stats.items(): + win_rate = (v['wins'] / v['count'] * 100) if v['count'] > 0 else 0 + print( + f"{v['name']} ({k}) - 信号数: {v['count']} | 胜率: {win_rate:.2f}% | 总盈利: {v['total_profit']:.2f}")