Merge branch 'master' into clean-shapes

dynamicslab · Sep 17, 2024 · 2249c3e · 2249c3e
2 parents 11432d2 + 137b19d
commit 2249c3e
Show file tree

Hide file tree

Showing 16 changed files with 1,194 additions and 1,473 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,7 +1,7 @@
 .git_archival.txt  export-subst
 
 # Interpret Jupyter notebooks as Python
-*.ipynb linguist-language=Python
+*.ipynb linguist-vendored
 
 *.ipynb	diff=jupyternotebook
 

diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -6,7 +6,7 @@ sphinx:
 build:
   os: "ubuntu-22.04"
   tools:
-    python: "3.8"
+    python: "3.11"
 
 python:
   install:

diff --git a/examples/16_noise_robustness/utils.py b/examples/16_noise_robustness/utils.py
@@ -1357,10 +1357,10 @@ def hyperparameter_scan_sr3(
     # start with initial guess that all coefs are zero
     optimizer = ps.EnsembleOptimizer(
         opt=ps.SR3(
-            threshold=0,
+            reg_weight_lam=0,
             max_iter=max_iter,
             normalize_columns=normalize_columns,
-            nu=nu,
+            relax_coeff_nu=nu,
         ),
         bagging=True,
         n_models=n_models,
@@ -1418,10 +1418,10 @@ def hyperparameter_scan_sr3(
     for i in range(tol_iter):
         optimizer = ps.EnsembleOptimizer(
             opt=ps.SR3(
-                threshold=tol,
+                reg_weight_lam=tol,
                 max_iter=max_iter,
                 normalize_columns=normalize_columns,
-                nu=nu,
+                relax_coeff_nu=nu,
             ),
             bagging=True,
             n_models=n_models,

diff --git a/examples/1_feature_overview/example.ipynb b/examples/1_feature_overview/example.ipynb