Skip to content

Added very basic silhouette score calculation to CAP #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Added very basic silhouette score calculation to CAP #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c58fbba
Update data_loader to support extraction of signals using masks
m-miedema Jul 4, 2025
f8cdbd9
Merge branch 'main' into main
m-miedema Jul 23, 2025
a9aab64
update to demo notebook
m-miedema Jul 23, 2025
ff86785
Added basic silhouette calculation to CAP method
m-miedema Oct 27, 2025
c749064
Merge branch 'neurodatascience:main' into sklearn_metrics
m-miedema Oct 27, 2025
b34ba70
Revert "Merge branch 'main' into main"
m-miedema Oct 27, 2025
070008d
Revert "update to demo notebook"
m-miedema Oct 27, 2025
9d58ec7
Revert "Update data_loader to support extraction of signals using masks"
m-miedema Oct 27, 2025
0cde2a3
integrating old upstream commits
m-miedema Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pydfc/data_loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,9 +361,9 @@ def nifti2array(

return time_series, labels, locs


def nifti2timeseries(
nifti_file,
n_rois,
Fs,
subj_id,
confound_strategy="none",
Expand Down
5 changes: 5 additions & 0 deletions pydfc/dfc_methods/cap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import numpy as np
from scipy.special import softmax
from sklearn.cluster import KMeans
from sklearn.metrics import silhouette_samples

from ..dfc import DFC
from ..time_series import TIME_SERIES
Expand Down Expand Up @@ -38,6 +39,7 @@ class CAP(BaseDFCMethod):
def __init__(self, **params):
self.logs_ = ""
self.FCS_ = []
self.silhouette_sc_ = []
self.mean_act = []
self.FCS_fit_time_ = None
self.dFC_assess_time_ = None
Expand Down Expand Up @@ -126,6 +128,9 @@ def estimate_FCS(self, time_series):
self.FCS_ = self.act_vec2FCS(group_act_centroids)
self.Z = self.kmeans_.predict(time_series.data.T.astype(np.float32))

# silhouette coefficient
self.silhouette_sc_ = silhouette_samples(time_series.data.T.astype(np.float32),self.Z)

# mean activation of states
self.set_mean_activity(time_series)

Expand Down