Skip to content

Commit d588285

Browse files
88d52bdba0366127fffca9dfa9389588d52bdba0366127fffca9dfa93895
andauthored
add debug (#570)
* fix plotting and warning --------- Co-authored-by: 88d52bdba0366127fffca9dfa93895 <[email protected]>
1 parent 4495242 commit d588285

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

pypfopt/cla.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ def _compute_lambda(self, covarF_inv, covarFB, meanF, wB, i, bi):
163163
if c == 0: # pragma: no cover
164164
return None, None
165165
# 2) bi
166-
if type(bi) == list:
166+
if isinstance(bi, list):
167167
bi = self._compute_bi(c, bi)
168168
# 3) Lambda
169169
if wB is None:

pypfopt/plotting.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def plot_dendrogram(hrp, ax=None, show_tickers=True, **kwargs):
101101

102102
if hrp.clusters is None:
103103
warnings.warn(
104-
"hrp param has not been optimized. Attempting optimization.",
104+
"hrp param has not been optimized. Attempting optimization.",
105105
RuntimeWarning,
106106
)
107107
hrp.optimize()

tests/test_efficient_frontier.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ def test_efficient_risk_market_neutral_L2_reg():
10191019

10201020

10211021
def test_efficient_risk_market_neutral_warning():
1022-
ef = setup_efficient_frontier()
1022+
ef = setup_efficient_frontier(solver=cp.ECOS)
10231023
with pytest.warns(RuntimeWarning) as w:
10241024
ef.efficient_risk(0.19, market_neutral=True)
10251025
assert len(w) == 1
@@ -1183,7 +1183,7 @@ def test_efficient_return_market_neutral_unbounded():
11831183

11841184
def test_efficient_return_market_neutral_warning():
11851185
# This fails
1186-
ef = setup_efficient_frontier()
1186+
ef = setup_efficient_frontier(solver=cp.ECOS)
11871187
with pytest.warns(RuntimeWarning) as w:
11881188
ef.efficient_return(0.25, market_neutral=True)
11891189
assert len(w) == 1

tests/test_plotting.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ def test_dendrogram_plot():
7272
hrp = HRPOpt(returns)
7373
with pytest.warns(RuntimeWarning) as w:
7474
ax = plotting.plot_dendrogram(hrp, show_tickers=False, showfig=False)
75-
assert len(w) == 1
75+
assert len(w) <= 2 # the second is FutureWarning if exists
7676
assert (
7777
str(w[0].message)
78-
== "hrp param has not been optimized. Attempting optimization."
78+
== "hrp param has not been optimized. Attempting optimization."
7979
)
8080
assert len(ax.findobj()) > 60
8181
assert type(ax.findobj()[0]) == matplotlib.collections.LineCollection

0 commit comments

Comments
 (0)