skfolio 0.10.0__tar.gz → 0.10.1__tar.gz

{skfolio-0.10.0/src/skfolio.egg-info → skfolio-0.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skfolio
-Version: 0.10.0
+Version: 0.10.1
 Summary: Portfolio optimization built on top of scikit-learn
 Author-email: Hugo Delatte <delatte.hugo@gmail.com>
 Maintainer-email: Hugo Delatte <delatte.hugo@gmail.com>, Matteo Manzi <matteomanzi09@gmail.com>
@@ -385,6 +385,7 @@ Imports
     )
     from skfolio.optimization import (
         MeanRisk,
+        HierarchicalRiskParity,
         NestedClustersOptimization,
         ObjectiveFunction,
         RiskBudgeting,
@@ -584,11 +585,13 @@ Factor Model
 
     factor_prices = load_factors_dataset()
 
-    X, y = prices_to_returns(prices, factor_prices)
-    X_train, X_test, y_train, y_test = train_test_split(X, y, test_size=0.33, shuffle=False)
+    X, factors = prices_to_returns(prices, factor_prices)
+    X_train, X_test, factors_train, factors_test = train_test_split(
+        X, factors, test_size=0.33, shuffle=False
+    )
 
     model = MeanRisk(prior_estimator=FactorModel())
-    model.fit(X_train, y_train)
+    model.fit(X_train, factors_train)
 
     print(model.weights_)
 
@@ -597,7 +600,6 @@ Factor Model
     print(portfolio.calmar_ratio)
     print(portfolio.summary())
 
-
 Factor Model & Covariance Detoning
 ----------------------------------
 .. code-block:: python
@@ -658,7 +660,7 @@ Combinatorial Purged Cross-Validation
 
     cv = CombinatorialPurgedCV(n_folds=10, n_test_folds=2)
 
-    print(cv.get_summary(X_train))
+    print(cv.summary(X_train))
 
     population = cross_val_predict(model, X_train, cv=cv)
 
@@ -674,7 +676,7 @@ Minimum CVaR Optimization on Synthetic Returns
 .. code-block:: python
 
     vine = VineCopula(log_transform=True, n_jobs=-1)
-    prior = =SyntheticData(distribution_estimator=vine, n_samples=2000)
+    prior = SyntheticData(distribution_estimator=vine, n_samples=2000)
     model = MeanRisk(risk_measure=RiskMeasure.CVAR, prior_estimator=prior)
     model.fit(X)
     print(model.weights_)
@@ -684,7 +686,7 @@ Stress Test
 -----------
 .. code-block:: python
 
-    vine = VineCopula(log_transform=True, central_assets=["BAC"]  n_jobs=-1)
+    vine = VineCopula(log_transform=True, central_assets=["BAC"], n_jobs=-1)
     vine.fit(X)
     X_stressed = vine.sample(n_samples=10_000, conditioning = {"BAC": -0.2})
     ptf_stressed = model.predict(X_stressed)
@@ -702,7 +704,7 @@ Minimum CVaR Optimization on Synthetic Factors
     )
     factor_model = FactorModel(factor_prior_estimator=factor_prior)
     model = MeanRisk(risk_measure=RiskMeasure.CVAR, prior_estimator=factor_model)
-    model.fit(X, y)
+    model.fit(X, factors)
     print(model.weights_)
 
 
@@ -713,7 +715,7 @@ Factor Stress Test
     factor_model.set_params(factor_prior_estimator__sample_args=dict(
         conditioning={"QUAL": -0.5}
     ))
-    factor_model.fit(X,y)
+    factor_model.fit(X, factors)
     stressed_dist = factor_model.return_distribution_
     stressed_ptf = model.predict(stressed_dist)
 

{skfolio-0.10.0 → skfolio-0.10.1}/README.rst

@@ -293,6 +293,7 @@ Imports
     )
     from skfolio.optimization import (
         MeanRisk,
+        HierarchicalRiskParity,
         NestedClustersOptimization,
         ObjectiveFunction,
         RiskBudgeting,
@@ -492,11 +493,13 @@ Factor Model
 
     factor_prices = load_factors_dataset()
 
-    X, y = prices_to_returns(prices, factor_prices)
-    X_train, X_test, y_train, y_test = train_test_split(X, y, test_size=0.33, shuffle=False)
+    X, factors = prices_to_returns(prices, factor_prices)
+    X_train, X_test, factors_train, factors_test = train_test_split(
+        X, factors, test_size=0.33, shuffle=False
+    )
 
     model = MeanRisk(prior_estimator=FactorModel())
-    model.fit(X_train, y_train)
+    model.fit(X_train, factors_train)
 
     print(model.weights_)
 
@@ -505,7 +508,6 @@ Factor Model
     print(portfolio.calmar_ratio)
     print(portfolio.summary())
 
-
 Factor Model & Covariance Detoning
 ----------------------------------
 .. code-block:: python
@@ -566,7 +568,7 @@ Combinatorial Purged Cross-Validation
 
     cv = CombinatorialPurgedCV(n_folds=10, n_test_folds=2)
 
-    print(cv.get_summary(X_train))
+    print(cv.summary(X_train))
 
     population = cross_val_predict(model, X_train, cv=cv)
 
@@ -582,7 +584,7 @@ Minimum CVaR Optimization on Synthetic Returns
 .. code-block:: python
 
     vine = VineCopula(log_transform=True, n_jobs=-1)
-    prior = =SyntheticData(distribution_estimator=vine, n_samples=2000)
+    prior = SyntheticData(distribution_estimator=vine, n_samples=2000)
     model = MeanRisk(risk_measure=RiskMeasure.CVAR, prior_estimator=prior)
     model.fit(X)
     print(model.weights_)
@@ -592,7 +594,7 @@ Stress Test
 -----------
 .. code-block:: python
 
-    vine = VineCopula(log_transform=True, central_assets=["BAC"]  n_jobs=-1)
+    vine = VineCopula(log_transform=True, central_assets=["BAC"], n_jobs=-1)
     vine.fit(X)
     X_stressed = vine.sample(n_samples=10_000, conditioning = {"BAC": -0.2})
     ptf_stressed = model.predict(X_stressed)
@@ -610,7 +612,7 @@ Minimum CVaR Optimization on Synthetic Factors
     )
     factor_model = FactorModel(factor_prior_estimator=factor_prior)
     model = MeanRisk(risk_measure=RiskMeasure.CVAR, prior_estimator=factor_model)
-    model.fit(X, y)
+    model.fit(X, factors)
     print(model.weights_)
 
 
@@ -621,7 +623,7 @@ Factor Stress Test
     factor_model.set_params(factor_prior_estimator__sample_args=dict(
         conditioning={"QUAL": -0.5}
     ))
-    factor_model.fit(X,y)
+    factor_model.fit(X, factors)
     stressed_dist = factor_model.return_distribution_
     stressed_ptf = model.predict(stressed_dist)
 

{skfolio-0.10.0 → skfolio-0.10.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "skfolio"
-version = "0.10.0"
+version = "0.10.1"
 maintainers = [
     { name = "Hugo Delatte", email = "delatte.hugo@gmail.com" },
     { name = "Matteo Manzi", email = "matteomanzi09@gmail.com" }

{skfolio-0.10.0 → skfolio-0.10.1}/src/skfolio/measures/_measures.py

@@ -136,7 +136,9 @@ def variance(
     if sample_weight is None:
         return np.var(returns, ddof=0 if biased else 1, axis=0)
 
-    biased_var = sample_weight @ (returns - mean(returns)) ** 2
+    biased_var = (
+        sample_weight @ (returns - mean(returns, sample_weight=sample_weight)) ** 2
+    )
     if biased:
         return biased_var
     n_eff = 1 / np.sum(sample_weight**2)
@@ -177,7 +179,7 @@ def semi_variance(
         If `returns` is a 2D-array, the result is a ndarray of shape (n_assets,).
     """
     if min_acceptable_return is None:
-        min_acceptable_return = mean(returns)
+        min_acceptable_return = mean(returns, sample_weight=sample_weight)
 
     biased_semi_var = mean(
         np.maximum(0, min_acceptable_return - returns) ** 2, sample_weight=sample_weight

{skfolio-0.10.0 → skfolio-0.10.1}/src/skfolio/prior/_entropy_pooling.py

@@ -589,10 +589,10 @@ class EntropyPooling(BasePrior):
 
         Parameters
         ----------
-        a : ndarray of shape (n_observations, n_constrains)
+        a : ndarray of shape (n_observations, n_constraints)
             Left matrix in `x @ a == b` or `x @ a <= b`.
 
-        a : ndarray of shape (n_observations, n_constrains)
+        a : ndarray of shape (n_observations, n_constraints)
             Right vector in `x @ a == b` or `x @ a <= b`.
 
         Returns
@@ -1029,16 +1029,16 @@ class EntropyPooling(BasePrior):
 
         """
         n_observations, _ = self._returns.shape
-        # Init constrains with sum(p)==1, rescaled by its norm
+        # Init constraints with sum(p)==1, rescaled by its norm
         # Has better convergence than the normalized form done inside the dual.
         a = [np.ones(n_observations).reshape(-1, 1) / np.sqrt(n_observations)]
         b = [np.array([1.0]) / np.sqrt(n_observations)]
         bounds = [(None, None)]
-        for name, constrains in self._constraints.items():
-            if constrains is not None:
-                a.append(constrains[0])
-                b.append(constrains[1])
-                s = constrains[1].size
+        for name, constraints in self._constraints.items():
+            if constraints is not None:
+                a.append(constraints[0])
+                b.append(constraints[1])
+                s = constraints[1].size
                 match name:
                     case "equality" | "cvar_equality":
                         bounds += [(None, None)] * s
@@ -1145,7 +1145,7 @@ class EntropyPooling(BasePrior):
 
         if self._constraints["fixed_equality"] is not None:
             a, b = self._constraints["fixed_equality"]
-            # Relaxe the problem with slack variables with a norm1 penalty to avoid
+            # Relax the problem with slack variables with a norm1 penalty to avoid
             # solver infeasibility that may arise from overly tight constraints from
             # fixing the moments.
             slack = cp.Variable(b.size)

{skfolio-0.10.0 → skfolio-0.10.1/src/skfolio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skfolio
-Version: 0.10.0
+Version: 0.10.1
 Summary: Portfolio optimization built on top of scikit-learn
 Author-email: Hugo Delatte <delatte.hugo@gmail.com>
 Maintainer-email: Hugo Delatte <delatte.hugo@gmail.com>, Matteo Manzi <matteomanzi09@gmail.com>
@@ -385,6 +385,7 @@ Imports
     )
     from skfolio.optimization import (
         MeanRisk,
+        HierarchicalRiskParity,
         NestedClustersOptimization,
         ObjectiveFunction,
         RiskBudgeting,
@@ -584,11 +585,13 @@ Factor Model
 
     factor_prices = load_factors_dataset()
 
-    X, y = prices_to_returns(prices, factor_prices)
-    X_train, X_test, y_train, y_test = train_test_split(X, y, test_size=0.33, shuffle=False)
+    X, factors = prices_to_returns(prices, factor_prices)
+    X_train, X_test, factors_train, factors_test = train_test_split(
+        X, factors, test_size=0.33, shuffle=False
+    )
 
     model = MeanRisk(prior_estimator=FactorModel())
-    model.fit(X_train, y_train)
+    model.fit(X_train, factors_train)
 
     print(model.weights_)
 
@@ -597,7 +600,6 @@ Factor Model
     print(portfolio.calmar_ratio)
     print(portfolio.summary())
 
-
 Factor Model & Covariance Detoning
 ----------------------------------
 .. code-block:: python
@@ -658,7 +660,7 @@ Combinatorial Purged Cross-Validation
 
     cv = CombinatorialPurgedCV(n_folds=10, n_test_folds=2)
 
-    print(cv.get_summary(X_train))
+    print(cv.summary(X_train))
 
     population = cross_val_predict(model, X_train, cv=cv)
 
@@ -674,7 +676,7 @@ Minimum CVaR Optimization on Synthetic Returns
 .. code-block:: python
 
     vine = VineCopula(log_transform=True, n_jobs=-1)
-    prior = =SyntheticData(distribution_estimator=vine, n_samples=2000)
+    prior = SyntheticData(distribution_estimator=vine, n_samples=2000)
     model = MeanRisk(risk_measure=RiskMeasure.CVAR, prior_estimator=prior)
     model.fit(X)
     print(model.weights_)
@@ -684,7 +686,7 @@ Stress Test
 -----------
 .. code-block:: python
 
-    vine = VineCopula(log_transform=True, central_assets=["BAC"]  n_jobs=-1)
+    vine = VineCopula(log_transform=True, central_assets=["BAC"], n_jobs=-1)
     vine.fit(X)
     X_stressed = vine.sample(n_samples=10_000, conditioning = {"BAC": -0.2})
     ptf_stressed = model.predict(X_stressed)
@@ -702,7 +704,7 @@ Minimum CVaR Optimization on Synthetic Factors
     )
     factor_model = FactorModel(factor_prior_estimator=factor_prior)
     model = MeanRisk(risk_measure=RiskMeasure.CVAR, prior_estimator=factor_model)
-    model.fit(X, y)
+    model.fit(X, factors)
     print(model.weights_)
 
 
@@ -713,7 +715,7 @@ Factor Stress Test
     factor_model.set_params(factor_prior_estimator__sample_args=dict(
         conditioning={"QUAL": -0.5}
     ))
-    factor_model.fit(X,y)
+    factor_model.fit(X, factors)
     stressed_dist = factor_model.return_distribution_
     stressed_ptf = model.predict(stressed_dist)