voly 0.0.200__py3-none-any.whl → 0.0.202__py3-none-any.whl

voly/core/fit.py

@@ -32,9 +32,7 @@ def fit_model(option_chain: pd.DataFrame, num_points: int = 2000) -> Tuple[pd.Da
     - num_points: Number of points for k_grid and plotting
 
     Returns:
-    - Tuple of (results_df, params_dict)
-      results_df: DataFrame with all fit results and performance metrics as columns, maturity_dates as index
-      params_dict: Dictionary mapping maturity_dates to (t, params)
+    - results_df: DataFrame with all fit results and performance metrics as columns, maturity_names as index
     """
     # Start overall timer
     start_total = time.time()
@@ -192,6 +190,9 @@ def fit_model(option_chain: pd.DataFrame, num_points: int = 2000) -> Tuple[pd.Da
     # Create results DataFrame
     results_df = pd.DataFrame(results_data, index=results_data['maturity_name'])
 
+    # Map maturity_date to maturity_name for indexing
+    date_to_name = dict(zip(results_data['maturity_date'], results_data['maturity_name']))
+
     # Convert columns to appropriate types
     for col, dtype in column_dtypes.items():
         if col in results_df.columns:
@@ -234,7 +235,7 @@ def fit_model(option_chain: pd.DataFrame, num_points: int = 2000) -> Tuple[pd.Da
             break
 
     for mat in sorted_maturities:
-        results_df.at[mat, 'calendar_arbitrage_free'] = calendar_arbitrage_free
+        results_df.at[date_to_name[mat], 'calendar_arbitrage_free'] = calendar_arbitrage_free
 
     # Calendar arbitrage correction
     for i in range(1, len(sorted_maturities)):
@@ -293,24 +294,24 @@ def fit_model(option_chain: pd.DataFrame, num_points: int = 2000) -> Tuple[pd.Da
                 butterfly_arbitrage_free = False
                 break
 
-        results_df.at[mat2, 'a'] = float(a_scaled)
-        results_df.at[mat2, 'b'] = float(b_scaled)
-        results_df.at[mat2, 'm'] = float(m)
-        results_df.at[mat2, 'rho'] = float(rho)
-        results_df.at[mat2, 'sigma'] = float(sigma)
-        results_df.at[mat2, 'nu'] = float(nu)
-        results_df.at[mat2, 'psi'] = float(psi)
-        results_df.at[mat2, 'p'] = float(p)
-        results_df.at[mat2, 'c'] = float(c)
-        results_df.at[mat2, 'nu_tilde'] = float(nu_tilde)
-        results_df.at[mat2, 'rmse'] = float(rmse)
-        results_df.at[mat2, 'mae'] = float(mae)
-        results_df.at[mat2, 'r2'] = float(r2)
-        results_df.at[mat2, 'max_error'] = float(max_error)
-        results_df.at[mat2, 'log_min_strike'] = float(log_min_strike)
-        results_df.at[mat2, 'usd_min_strike'] = float(usd_min_strike)
-        results_df.at[mat2, 'butterfly_arbitrage_free'] = butterfly_arbitrage_free
-        results_df.at[mat2, 'fit_success'] = bool(not np.isnan(a))
+        results_df.at[date_to_name[mat2], 'a'] = float(a_scaled)
+        results_df.at[date_to_name[mat2], 'b'] = float(b_scaled)
+        results_df.at[date_to_name[mat2], 'm'] = float(m)
+        results_df.at[date_to_name[mat2], 'rho'] = float(rho)
+        results_df.at[date_to_name[mat2], 'sigma'] = float(sigma)
+        results_df.at[date_to_name[mat2], 'nu'] = float(nu)
+        results_df.at[date_to_name[mat2], 'psi'] = float(psi)
+        results_df.at[date_to_name[mat2], 'p'] = float(p)
+        results_df.at[date_to_name[mat2], 'c'] = float(c)
+        results_df.at[date_to_name[mat2], 'nu_tilde'] = float(nu_tilde)
+        results_df.at[date_to_name[mat2], 'rmse'] = float(rmse)
+        results_df.at[date_to_name[mat2], 'mae'] = float(mae)
+        results_df.at[date_to_name[mat2], 'r2'] = float(r2)
+        results_df.at[date_to_name[mat2], 'max_error'] = float(max_error)
+        results_df.at[date_to_name[mat2], 'log_min_strike'] = float(log_min_strike)
+        results_df.at[date_to_name[mat2], 'usd_min_strike'] = float(usd_min_strike)
+        results_df.at[date_to_name[mat2], 'butterfly_arbitrage_free'] = butterfly_arbitrage_free
+        results_df.at[date_to_name[mat2], 'fit_success'] = bool(not np.isnan(a))
 
     # Calendar arbitrage check (post-correction)
     calendar_arbitrage_free = True
@@ -341,13 +342,14 @@ def fit_model(option_chain: pd.DataFrame, num_points: int = 2000) -> Tuple[pd.Da
             break
 
     for mat in sorted_maturities:
-        results_df.at[mat, 'calendar_arbitrage_free'] = calendar_arbitrage_free
+        results_df.at[date_to_name[mat], 'calendar_arbitrage_free'] = calendar_arbitrage_free
 
     # End overall timer and print total time
     end_total = time.time()
     logger.info(f"Total execution time for the model: {end_total - start_total:.4f} seconds")
 
     logger.info("Model fitting complete.")
+    results_df = results_df.drop(columns='maturity_name')
     return results_df
 
 

{voly-0.0.200.dist-info → voly-0.0.202.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: voly
-Version: 0.0.200
+Version: 0.0.202
 Summary: Options & volatility research package
 Author-email: Manu de Cara <manu.de.cara@gmail.com>
 License: MIT

{voly-0.0.200.dist-info → voly-0.0.202.dist-info}/RECORD

@@ -6,15 +6,15 @@ voly/models.py,sha256=Wop6gZbvAOXSmI0JpYapjVSeJub_i8RLif2PzxRsfFE,7185
 voly/core/__init__.py,sha256=bu6fS2I1Pj9fPPnl-zY3L7NqrZSY5Zy6NY2uMUvdhKs,183
 voly/core/charts.py,sha256=2S-BfCo30aj1_xlNLqF-za5rQWxF_mWKIdtdOe5bgbw,12735
 voly/core/data.py,sha256=9v9iuE2XdIIlzoRAB7q1ol7YghBzBsPGAiwZ11oDuis,13650
-voly/core/fit.py,sha256=qWs7rce9QcC7CDlB4PVi1fIfH5PmShwPWcKH_8N46_A,17068
+voly/core/fit.py,sha256=Ya2g8tNHw_5QFqD66_U4b7z18iWYSF-q_SBeRqBSjU8,17443
 voly/core/hd.py,sha256=UFAyLncNUHivpPAcko6IK1bC55mudVtdlRFfXp63HXE,14771
 voly/core/interpolate.py,sha256=JkK172-FXyhesW3hY4pEeuJWG3Bugq7QZXbeKoRpLuo,5305
 voly/core/rnd.py,sha256=GoC3m1Q46Wnk5tV_mstr-3_aktHeue6BBLh4DQTciW0,13307
 voly/utils/__init__.py,sha256=E05mWatyC-PDOsCxQV1p5Xi1IgpOomxrNURyCx_gB-w,200
 voly/utils/density.py,sha256=q0fX4im9TGwMCZ32Hzdv8CNh56KnJo8bmG5w0gVWZH8,5879
 voly/utils/logger.py,sha256=4-_2bVJmq17Q0d7Rd2mPg1AeR8gxv6EPvcmBDMFWcSM,1744
-voly-0.0.200.dist-info/licenses/LICENSE,sha256=wcHIVbE12jfcBOai_wqBKY6xvNQU5E909xL1zZNq_2Q,1065
-voly-0.0.200.dist-info/METADATA,sha256=AT0HE9o9XQccEK1nuOdAh2kRMLuk1E_4e7o7-kEUQRg,4115
-voly-0.0.200.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-voly-0.0.200.dist-info/top_level.txt,sha256=ZfLw2sSxF-LrKAkgGjOmeTcw6_gD-30zvtdEY5W4B7c,5
-voly-0.0.200.dist-info/RECORD,,
+voly-0.0.202.dist-info/licenses/LICENSE,sha256=wcHIVbE12jfcBOai_wqBKY6xvNQU5E909xL1zZNq_2Q,1065
+voly-0.0.202.dist-info/METADATA,sha256=3CWte_z_H0YA3JgacjwwhwRekrDnjOyHnK30g7FkK8s,4115
+voly-0.0.202.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+voly-0.0.202.dist-info/top_level.txt,sha256=ZfLw2sSxF-LrKAkgGjOmeTcw6_gD-30zvtdEY5W4B7c,5
+voly-0.0.202.dist-info/RECORD,,