use f-string in save_one_run_results

letianzj · Jun 20, 2024 · 224341d · 224341d
1 parent 1a9a98c
commit 224341d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/examples/download_historical_data_from_ib.py b/examples/download_historical_data_from_ib.py
@@ -53,7 +53,6 @@ def historical_event_handler(self, bar_event: BarEvent) -> None:
         self.df = pd.concat([self.df, df1], axis=0)
 
     def run(self) -> None:
-        dfd = pd.DataFrame()
         dict_all = {}
         events_engine = LiveEventEngine()
         tick_event_engine = LiveEventEngine()
@@ -96,6 +95,8 @@ def run(self) -> None:
         ]
 
         for sym in symbols:
+            dfd = pd.DataFrame()
+            self.df = pd.DataFrame(columns=["Open", "High", "Low", "Close", "Volume"])
             end_date = datetime.strptime(self.date, "%Y%m%d")
             if "STK" in sym:
                 end_date = end_date + timedelta(hours=16)  # 16:00
@@ -140,7 +141,7 @@ def run(self) -> None:
     parser.add_argument("--date", help="yyyymmdd", required=True)
     parser.add_argument(
         "--path",
-        default="c:/workspace/data/tick/",
+        default="c:/workspace/data/ticks/",
         help="hist data folder",
     )
 

diff --git a/quanttrader/util/util_func.py b/quanttrader/util/util_func.py
@@ -108,18 +108,6 @@ def save_one_run_results(
     batch_tag: bool = False,
 ) -> None:
 
-    df_positions.to_csv(
-        "{}{}{}{}".format(
-            output_dir, "/positions_", batch_tag if batch_tag else "", ".csv"
-        )
-    )
-    df_trades.to_csv(
-        "{}{}{}{}".format(
-            output_dir, "/trades_", batch_tag if batch_tag else "", ".csv"
-        )
-    )
-    equity.to_csv(
-        "{}{}{}{}".format(
-            output_dir, "/equity_", batch_tag if batch_tag else "", ".csv"
-        )
-    )
+    df_positions.to_csv(f"{output_dir}/positions_{batch_tag if batch_tag else ""}.csv")
+    df_trades.to_csv(f"{output_dir}/trades_{batch_tag if batch_tag else ""}.csv")
+    equity.to_csv(f"{output_dir}/equity_{batch_tag if batch_tag else ""}.csv")