Misc pd/np compatibility stuff

ranaroussi · Oct 25, 2024 · 4eb3092 · 4eb3092
1 parent f19d5b2
commit 4eb3092
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 46 deletions.
diff --git a/quantstats/_plotting/core.py b/quantstats/_plotting/core.py
@@ -291,10 +291,10 @@ def plot_timeseries(
 
     if resample:
         returns = returns.resample(resample)
-        returns = returns.last() if compound is True else returns.sum()
+        returns = returns.last() if compound is True else returns.sum(axis=0)
         if isinstance(benchmark, _pd.Series):
             benchmark = benchmark.resample(resample)
-            benchmark = benchmark.last() if compound is True else benchmark.sum()
+            benchmark = benchmark.last() if compound is True else benchmark.sum(axis=0)
     # ---------------
 
     fig, ax = _plt.subplots(figsize=figsize)

diff --git a/quantstats/_plotting/wrappers.py b/quantstats/_plotting/wrappers.py
@@ -294,7 +294,7 @@ def earnings(
     ax.spines["left"].set_visible(False)
 
     fig.suptitle(
-        title, fontsize=14, y=0.995, fontname=fontname, fontweight="bold", color="black"
+        f"    {title}", fontsize=12, y=0.95, fontname=fontname, fontweight="bold", color="black"
     )
 
     if subtitle:
@@ -312,7 +312,7 @@ def earnings(
                     )
                 ),
             ),
-            fontsize=12,
+            fontsize=10,
             color="gray",
         )
 
@@ -336,11 +336,13 @@ def earnings(
         "Value of  ${:,.0f}".format(start_balance),
         fontname=fontname,
         fontweight="bold",
-        fontsize=12,
+        fontsize=11,
     )
 
     ax.yaxis.set_major_formatter(_FuncFormatter(_core.format_cur_axis))
     ax.yaxis.set_label_coords(-0.1, 0.5)
+    _plt.xticks(fontsize=11)
+    _plt.yticks(fontsize=11)
 
     fig.set_facecolor("white")
     ax.set_facecolor("white")
@@ -934,8 +936,8 @@ def rolling_sortino(
 def monthly_heatmap(
     returns,
     benchmark=None,
-    annot_size=10,
-    figsize=(10, 5),
+    annot_size=13,
+    figsize=(8, 5),
     cbar=True,
     square=False,
     returns_label="Strategy",
@@ -1004,12 +1006,13 @@ def monthly_heatmap(
     else:
         ax.set_title(
             f"{returns_label} - Monthly Returns (%)\n",
-            fontsize=14,
+            fontsize=12,
             y=0.995,
             fontname=fontname,
             fontweight="bold",
             color="black",
         )
+
         ax = _sns.heatmap(
             returns,
             ax=ax,
@@ -1023,7 +1026,10 @@ def monthly_heatmap(
             cmap=cmap,
             cbar_kws={"format": "%.0f%%"},
         )
-    # _sns.set(font_scale=1)
+
+    if cbar:
+        cbar = ax.collections[0].colorbar
+        cbar.ax.tick_params(labelsize=annot_size)
 
     # align plot to match other
     if ylabel:
@@ -1062,7 +1068,7 @@ def monthly_heatmap(
 
 def monthly_returns(
     returns,
-    annot_size=10,
+    annot_size=9,
     figsize=(10, 5),
     cbar=True,
     square=False,