juaml · synchon · Jul 19, 2024 · Jun 14, 2024 · Jun 14, 2024 · Jun 14, 2024
diff --git a/docs/changes/newsfragments/348.change b/docs/changes/newsfragments/348.change
@@ -0,0 +1 @@
+For :class:`.CrossParcellationFC`, ``aggregation_method`` and ``correlation_method`` have been renamed to ``agg_method`` and ``corr_method`` respectively and ``agg_method_params`` has been added; for ``FunctionalConnectivityBase``, :class:`.FunctionalConnectivityParcels`, :class:`.FunctionalConnectivitySpheres`, :class:`.EdgeCentricFCParcels` and :class:`.EdgeCentricFCSpheres`, ``cor_method`` and ``cor_method_params`` have been renamed to ``conn_method`` and ``conn_method_params`` by `Synchon Mandal`_
diff --git a/docs/changes/newsfragments/348.enh b/docs/changes/newsfragments/348.enh
@@ -0,0 +1 @@
+``FunctionalConnectivity``-family Markers now use :class:`sklearn.covariance.EmpiricalCovariance` as the default covariance estimator and ``correlation`` as the default connecivity matrix kind by `Synchon Mandal`_
diff --git a/docs/changes/newsfragments/348.feature b/docs/changes/newsfragments/348.feature
@@ -0,0 +1 @@
+Introduce :class:`.JuniferConnectivityMeasure` for customising functional connectivity matrix kinds and measurements by `Synchon Mandal`_
diff --git a/docs/conf.py b/docs/conf.py
@@ -170,6 +170,7 @@
     "Engine",
     "positive",
     "negative",
+    "estimator",
 }
 # numpydoc_validation_checks = {
 #     "all",

diff --git a/ignore_words.txt b/ignore_words.txt
@@ -5,3 +5,4 @@ sepulcre
 arange
 sinc
 whit
+amin
diff --git a/junifer/external/nilearn/__init__.py b/junifer/external/nilearn/__init__.py
@@ -4,6 +4,7 @@
 # License: AGPL
 
 from .junifer_nifti_spheres_masker import JuniferNiftiSpheresMasker
+from .junifer_connectivity_measure import JuniferConnectivityMeasure
 
 
-__all__ = ["JuniferNiftiSpheresMasker"]
+__all__ = ["JuniferNiftiSpheresMasker", "JuniferConnectivityMeasure"]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		For :class:`.CrossParcellationFC`, ``aggregation_method`` and ``correlation_method`` have been renamed to ``agg_method`` and ``corr_method`` respectively and ``agg_method_params`` has been added; for ``FunctionalConnectivityBase``, :class:`.FunctionalConnectivityParcels`, :class:`.FunctionalConnectivitySpheres`, :class:`.EdgeCentricFCParcels` and :class:`.EdgeCentricFCSpheres`, ``cor_method`` and ``cor_method_params`` have been renamed to ``conn_method`` and ``conn_method_params`` by `Synchon Mandal`_
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		``FunctionalConnectivity``-family Markers now use :class:`sklearn.covariance.EmpiricalCovariance` as the default covariance estimator and ``correlation`` as the default connecivity matrix kind by `Synchon Mandal`_
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Introduce :class:`.JuniferConnectivityMeasure` for customising functional connectivity matrix kinds and measurements by `Synchon Mandal`_
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,4 @@ sepulcre @@
     arange
     sinc
     whit
+    amin