Skip to content

Commit ac7201f

Browse files
committed
Black Format
1 parent c4ee3b0 commit ac7201f

File tree

4 files changed

+20
-37
lines changed

4 files changed

+20
-37
lines changed

riskfolio/src/AuxFunctions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ def std_silhouette_score(dist, clusters, max_k=10):
769769
scores_list = []
770770

771771
# get within-cluster dissimilarity for each k
772-
for k in range(1, min(len(num_k)-1, max_k)):
772+
for k in range(1, min(len(num_k) - 1, max_k)):
773773
level = cluster_lvls.iloc[:, k] # get k clusters
774774
b = silhouette_samples(dist, level)
775775
scores_list.append(b.mean() / b.std())

riskfolio/src/HCPortfolio.py

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,9 @@ def _opt_w(
226226
else:
227227
method_kurt = None
228228

229-
port.assets_stats(method_mu="hist",
230-
method_cov="hist",
231-
method_kurt=method_kurt)
229+
port.assets_stats(
230+
method_mu="hist", method_cov="hist", method_kurt=method_kurt
231+
)
232232
if self.solvers is not None:
233233
port.solvers = self.solvers
234234
if mu is not None:
@@ -247,9 +247,9 @@ def _opt_w(
247247
method_kurt = "hist"
248248
else:
249249
method_kurt = None
250-
port.assets_stats(method_mu="hist",
251-
method_cov="hist",
252-
method_kurt=method_kurt)
250+
port.assets_stats(
251+
method_mu="hist", method_cov="hist", method_kurt=method_kurt
252+
)
253253
if self.solvers is not None:
254254
port.solvers = self.solvers
255255
if mu is not None:
@@ -697,7 +697,10 @@ def _intra_weights(
697697
rf=rf,
698698
l=l,
699699
)
700-
weights = pd.Series(weights.flatten(), index=cluster_cov.index,)
700+
weights = pd.Series(
701+
weights.flatten(),
702+
index=cluster_cov.index,
703+
)
701704
intra_weights[i] = weights
702705

703706
intra_weights = intra_weights.fillna(0)
@@ -951,9 +954,7 @@ def optimization(
951954
else:
952955
self.cov = custom_cov.copy()
953956
else:
954-
self.cov = pe.covar_matrix(
955-
self.returns, method=method_cov, **dict_cov
956-
)
957+
self.cov = pe.covar_matrix(self.returns, method=method_cov, **dict_cov)
957958

958959
# Mean vector
959960
if method_mu == "custom_mu":
@@ -969,12 +970,10 @@ def optimization(
969970
else:
970971
raise NameError("custom_mu must be a column DataFrame or Series")
971972
else:
972-
self.mu = pe.mean_vector(
973-
self.returns, method=method_mu, **dict_mu
974-
)
975-
if rm == 'KT':
973+
self.mu = pe.mean_vector(self.returns, method=method_mu, **dict_mu)
974+
if rm == "KT":
976975
self.kurt, self.skurt = True, False
977-
elif rm == 'SKT':
976+
elif rm == "SKT":
978977
self.kurt, self.skurt = False, True
979978
else:
980979
self.kurt, self.skurt = False, False
@@ -1081,13 +1080,7 @@ def optimization(
10811080
)
10821081

10831082
# Step-3.2: Determine inter-cluster weights and multiply with 􏰁→ intra-cluster weights
1084-
weights = self._inter_weights(
1085-
intra_weights,
1086-
obj=obj,
1087-
rm=rm,
1088-
rf=rf,
1089-
l=l
1090-
)
1083+
weights = self._inter_weights(intra_weights, obj=obj, rm=rm, rf=rf, l=l)
10911084

10921085
weights = weights.loc[self.assetslist]
10931086

riskfolio/src/PlotFunctions.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,6 @@ def plot_frontier(
425425
a2 = str(w_.shape)
426426
raise ValueError("shapes " + a1 + " and " + a2 + " not aligned")
427427

428-
429-
430428
if beta is None:
431429
beta = alpha
432430
if b_sim is None:
@@ -1032,13 +1030,7 @@ def plot_bar(
10321030

10331031

10341032
def plot_frontier_area(
1035-
w_frontier,
1036-
nrow=25,
1037-
cmap="tab20",
1038-
n_colors=20,
1039-
height=6,
1040-
width=10,
1041-
ax=None
1033+
w_frontier, nrow=25, cmap="tab20", n_colors=20, height=6, width=10, ax=None
10421034
):
10431035
r"""
10441036
Create a chart with the asset composition of the efficient frontier.
@@ -1897,7 +1889,7 @@ def plot_hist(
18971889
label=r"Normal: $\mu=$"
18981890
+ r"{0:.2%},".format(mu)
18991891
+ r" $\sigma=$"
1900-
+ r"{0:.2%}".format(sigma)
1892+
+ r"{0:.2%}".format(sigma),
19011893
)
19021894

19031895
factor = (np.max(a) - np.min(a)) / bins
@@ -2995,7 +2987,7 @@ def plot_clusters(
29952987
ax1.set_title(title)
29962988
elif dendrogram == False:
29972989
ax.set_title(title)
2998-
ax.set_position([0,0.17,1,1])
2990+
ax.set_position([0, 0.17, 1, 1])
29992991
axcolor.set_position([1.2, 0.17, 0.035, 1])
30002992

30012993
try:

riskfolio/src/Portfolio.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,9 +1172,7 @@ def blfactors_stats(
11721172

11731173
if B is None:
11741174
if self.B is None:
1175-
self.B = pe.loadings_matrix(X=F,
1176-
Y=X,
1177-
**dict_load)
1175+
self.B = pe.loadings_matrix(X=F, Y=X, **dict_load)
11781176
const = True
11791177
elif self.B is not None:
11801178
pass

0 commit comments

Comments
 (0)