plotguy 2.1.2__tar.gz → 2.1.4__tar.gz

{plotguy-2.1.2 → plotguy-2.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotguy
-Version: 2.1.2
+Version: 2.1.4
 Summary: Plotguy
 Home-page: https://pypi.org/project/plotguy/
 Author: Plotguy Team
@@ -8,7 +8,7 @@ Author-email: plotguy.info@gmail.com
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
-Requires-Dist: setuptools
+Requires-Dist: setuptools==80.10.2
 Requires-Dist: numpy==2.4.2
 Requires-Dist: pandas==2.3.3
 Requires-Dist: hkfdb

{plotguy-2.1.2 → plotguy-2.1.4}/plotguy/__init__.py

@@ -160,7 +160,6 @@ def save_backtest_result(df, para_combination_item):
 
     if len(df_count) == 0:
         num_of_trade = 0
-
         equity_net_profit = 0
         equity_return_on_capital = 0
         equity_annualized_return = 0
@@ -179,6 +178,15 @@ def save_backtest_result(df, para_combination_item):
         cov_count = 0
         total_commission = 0
 
+        start_year = df.index[0].year
+        end_year = df.index[-1].year
+
+        yearly_stats_string = ''
+        for year in range(start_year, end_year + 1):
+            yearly_stats_string += f'{year},year_trade_count:0.00,year_win_rate:00.00,year_return:-00.00|'
+
+        yearly_stats_string = yearly_stats_string[:-1]
+
     elif len(df_count) > 0:
 
         ########### by year count, win rate and return ###############
@@ -281,7 +289,6 @@ def save_backtest_result(df, para_combination_item):
         'equity_annualized_std': equity_annualized_std,
         'equity_annualized_sr': equity_annualized_sr,
         'equity_net_profit_to_mdd': equity_net_profit_to_mdd,
-
         'equity_mdd_dollar': equity_mdd_dollar,
         'equity_mdd_pct': equity_mdd_pct,
 
@@ -291,7 +298,6 @@ def save_backtest_result(df, para_combination_item):
         'price_annualized_std': price_annualized_std,
         'price_annualized_sr': price_annualized_sr,
         'price_net_profit_to_mdd': price_net_profit_to_mdd,
-
         'price_mdd_dollar': price_mdd_dollar,
         'price_mdd_pct': price_mdd_pct,
 

{plotguy-2.1.2 → plotguy-2.1.4}/plotguy/components.py

@@ -397,13 +397,22 @@ class Components:
                 year_return      = '-----'
             else:
                 format_content = value['year_win_rate']
-                year_win_rate = "{:d} %".format(int(format_content))
+                if np.isnan(format_content):
+                    year_win_rate = 'nan'
+                else:
+                    year_win_rate = "{:d} %".format(int(format_content))
 
                 format_content = value['year_return']
-                year_return = "{:d} %".format(int(format_content))
+                if np.isnan(format_content):
+                    year_return = 'nan'
+                else:
+                    year_return = "{:d} %".format(int(format_content))
 
                 format_content = value['year_trade_count']
-                year_trade_count = str(int(format_content))
+                if np.isnan(format_content):
+                    year_trade_count = 'nan'
+                else:
+                    year_trade_count = str(int(format_content))
 
             if idx%2 == 1:
                 year_col1.append(

{plotguy-2.1.2 → plotguy-2.1.4}/plotguy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plotguy
-Version: 2.1.2
+Version: 2.1.4
 Summary: Plotguy
 Home-page: https://pypi.org/project/plotguy/
 Author: Plotguy Team
@@ -8,7 +8,7 @@ Author-email: plotguy.info@gmail.com
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
-Requires-Dist: setuptools
+Requires-Dist: setuptools==80.10.2
 Requires-Dist: numpy==2.4.2
 Requires-Dist: pandas==2.3.3
 Requires-Dist: hkfdb

{plotguy-2.1.2 → plotguy-2.1.4}/plotguy.egg-info/requires.txt

@@ -1,4 +1,4 @@
-setuptools
+setuptools==80.10.2
 numpy==2.4.2
 pandas==2.3.3
 hkfdb

{plotguy-2.1.2 → plotguy-2.1.4}/setup.py

@@ -5,14 +5,14 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="plotguy",
-    version="2.1.2",
+    version="2.1.4",
     author="Plotguy Team",
     author_email="plotguy.info@gmail.com",
     description="Plotguy",
     long_description=long_description,
     long_description_content_type="text/markdown",
     install_requires=[         
-        'setuptools',  
+        'setuptools==80.10.2',  
         'numpy==2.4.2',  
         'pandas==2.3.3',  
         'hkfdb',