From 24d2143805dca5accd4d9fe324ee9ff15f95c2ad Mon Sep 17 00:00:00 2001
From: cardosofede <federico.cardoso.e@gmail.com>
Date: Tue, 5 Sep 2023 03:17:32 +0300
Subject: [PATCH] (feat) adapt optuna manager to new naming

---
 utils/optuna_database_manager.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/utils/optuna_database_manager.py b/utils/optuna_database_manager.py
index 5c79c18..d3a68a3 100644
--- a/utils/optuna_database_manager.py
+++ b/utils/optuna_database_manager.py
@@ -225,8 +225,8 @@ class OptunaDBManager:
                          f"Loss Signals: {x['loss_signals']}<br>"
                          f"Max Drawdown [%]: {100 * x['max_drawdown_pct']:.2f} %<br>"
                          f"Max Drawdown [USD]: $ {x['max_drawdown_usd']:.2f}<br>"
-                         f"Net Profit [%]: {100 * x['net_profit_pct']:.2f} %<br>"
-                         f"Net Profit [$]: $ {x['net_profit_usd']:.2f}<br>"
+                         f"Net Profit [%]: {100 * x['net_pnl_pct']:.2f} %<br>"
+                         f"Net Profit [$]: $ {x['net_pnl_quote']:.2f}<br>"
                          f"Profit Factor: {x['profit_factor']:.2f}<br>"
                          f"Sharpe Ratio: {x['sharpe_ratio']:.4f}<br>"
                          f"Total Positions: {x['total_positions']}<br>"
@@ -238,7 +238,7 @@ class OptunaDBManager:
 
     def _get_merged_df(self):
         float_cols = ["accuracy", "avg_trading_time_in_hours", "duration_in_hours", "max_drawdown_pct", "max_drawdown_usd",
-                      "net_profit_pct", "net_profit_usd", "profit_factor", "sharpe_ratio", "value"]
+                      "net_pnl_pct", "net_pnl_quote", "profit_factor", "sharpe_ratio", "value"]
         int_cols = ["loss_signals", "total_positions", "win_signals"]
         merged_df = self.trials\
             .merge(self.studies, on="study_id")\