Merge pull request #244 from nipreps/enh/gp-model-improvements

ENH: Improving GP models
nipreps · Oct 28, 2024 · ef91d4f · ef91d4f
2 parents fa57a64 + 6e6ff4a
commit ef91d4f
Show file tree

Hide file tree

Showing 4 changed files with 581 additions and 98 deletions.
diff --git a/docs/notebooks/dmri_covariance.ipynb b/docs/notebooks/dmri_covariance.ipynb
diff --git a/scripts/dwi_gp_estimation_error_analysis.py b/scripts/dwi_gp_estimation_error_analysis.py
@@ -180,6 +180,10 @@ def main() -> None:
         kernel=SphericalKriging(a=a, lambda_s=lambda_s),
         alpha=alpha,
         optimizer=None,
+        # optimizer="Nelder-Mead",
+        # disp=True,
+        # ftol=1,
+        # max_iter=2e5,
     )
 
     # Use Scikit-learn cross validation

diff --git a/src/eddymotion/model/_dipy.py b/src/eddymotion/model/_dipy.py
@@ -92,8 +92,8 @@ class GaussianProcessModel(ReconstModel):
     def __init__(
         self,
         kernel_model: str = "spherical",
-        lambda_s: float = 2.0,
-        a: float = 0.1,
+        beta_l: float = 2.0,
+        beta_a: float = 0.1,
         sigma_sq: float = 1.0,
         *args,
         **kwargs,
@@ -129,8 +129,8 @@ def __init__(
 
         KernelType = SphericalKriging if kernel_model == "spherical" else ExponentialKriging
         self.kernel = KernelType(
-            a=a,
-            lambda_s=lambda_s,
+            beta_a=beta_a,
+            beta_l=beta_l,
         )
 
     def fit(