CTYPTO/freqtrade
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2025-12-02 01:53:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

A few more formatting updates

Browse Source
This commit is contained in:
Matthias
2024-05-13 19:49:15 +02:00
parent 6a802f5624
commit 9291698561
20 changed files with 198 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
freqtrade/optimize/optimize_reports/bt_output.py
View File

@@ -89,9 +89,11 @@ def text_table_tags(tag_type: str, tag_results: List[Dict[str, Any]], stake_curr
floatfmt = _get_line_floatfmt(stake_currency)
output = [
[
t["key"]
if t.get("key") is not None and len(str(t["key"])) > 0
else t.get(fallback, "OTHER"),
(
t["key"]
if t.get("key") is not None and len(str(t["key"])) > 0
else t.get(fallback, "OTHER")
),
t["trades"],
t["profit_mean_pct"],
t["profit_total_abs"],
@@ -218,9 +220,11 @@ def text_table_add_metrics(strat_results: Dict) -> str:
)
drawdown_metrics.extend(
[
("Absolute Drawdown (Account)", f"{strat_results['max_drawdown_account']:.2%}")
if "max_drawdown_account" in strat_results
else ("Drawdown", f"{strat_results['max_drawdown']:.2%}"),
(
("Absolute Drawdown (Account)", f"{strat_results['max_drawdown_account']:.2%}")
if "max_drawdown_account" in strat_results
else ("Drawdown", f"{strat_results['max_drawdown']:.2%}")
),
(
"Absolute Drawdown",
fmt_coin(strat_results["max_drawdown_abs"], strat_results["stake_currency"]),
@@ -279,9 +283,11 @@ def text_table_add_metrics(strat_results: Dict) -> str:
("Calmar", f"{strat_results['calmar']:.2f}" if "calmar" in strat_results else "N/A"),
(
"Profit factor",
f'{strat_results["profit_factor"]:.2f}'
if "profit_factor" in strat_results
else "N/A",
(
f'{strat_results["profit_factor"]:.2f}'
if "profit_factor" in strat_results
else "N/A"
),
),
(
"Expectancy (Ratio)",
@@ -335,11 +341,13 @@ def text_table_add_metrics(strat_results: Dict) -> str:
(
"Max Consecutive Wins / Loss",
(
f"{strat_results['max_consecutive_wins']} / "
f"{strat_results['max_consecutive_losses']}"
)
if "max_consecutive_losses" in strat_results
else "N/A",
(
f"{strat_results['max_consecutive_wins']} / "
f"{strat_results['max_consecutive_losses']}"
)
if "max_consecutive_losses" in strat_results
else "N/A"
),
),
("Rejected Entry signals", strat_results.get("rejected_signals", "N/A")),
(