de-Rodrigo commited on
Commit
a3d2178
·
1 Parent(s): bdfc29f
Files changed (1) hide show
  1. app.py +5 -4
app.py CHANGED
@@ -587,9 +587,10 @@ def compute_global_regression(df_combined, embedding_cols, tsne_params, df_f1, r
587
  silhouette = None
588
 
589
  if reduction_method in ("t-SNE","PCA"):
590
- X = df_combined[embedding_cols].values
591
- trust = trustworthiness(X, reduced, n_neighbors=TSNE_NEIGHBOURS)
592
- cont = compute_continuity(X, reduced, n_neighbors=TSNE_NEIGHBOURS)
 
593
 
594
  # silhouette_clustering = DBSCAN(eps=0.1, min_samples=15).fit(reduced)
595
  # silhouette_labels = silhouette_clustering.labels_
@@ -606,7 +607,7 @@ def compute_global_regression(df_combined, embedding_cols, tsne_params, df_f1, r
606
  silhouette_vals = []
607
  for feature in feature_options:
608
  labels = df_heat[feature].values
609
- silhouette = silhouette_score(reduced, labels)
610
  silhouette_vals.append(silhouette)
611
 
612
  silhouette = np.mean(silhouette_vals)
 
587
  silhouette = None
588
 
589
  if reduction_method in ("t-SNE","PCA"):
590
+ # X = df_combined[embedding_cols].values
591
+ X = df_combined[real_mask][embedding_cols].values
592
+ trust = trustworthiness(X, reduced_real, n_neighbors=TSNE_NEIGHBOURS)
593
+ cont = compute_continuity(X, reduced_real, n_neighbors=TSNE_NEIGHBOURS)
594
 
595
  # silhouette_clustering = DBSCAN(eps=0.1, min_samples=15).fit(reduced)
596
  # silhouette_labels = silhouette_clustering.labels_
 
607
  silhouette_vals = []
608
  for feature in feature_options:
609
  labels = df_heat[feature].values
610
+ silhouette = silhouette_score(reduced_real, labels)
611
  silhouette_vals.append(silhouette)
612
 
613
  silhouette = np.mean(silhouette_vals)