cc-mapping 0.2.2__tar.gz → 0.2.4__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/PKG-INFO +1 -1
  2. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/pyproject.toml +1 -1
  3. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/src/cc_mapping/plot.py +11 -4
  4. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/src/cc_mapping/thresholding/sequential.py +16 -5
  5. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/LICENSE +0 -0
  6. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/README.md +0 -0
  7. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/src/cc_mapping/__init__.py +0 -0
  8. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/src/cc_mapping/core.py +0 -0
  9. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/src/cc_mapping/feature_selection/__init__.py +0 -0
  10. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/src/cc_mapping/feature_selection/_base.py +0 -0
  11. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/src/cc_mapping/feature_selection/_persistence.py +0 -0
  12. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/src/cc_mapping/feature_selection/_plotting.py +0 -0
  13. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/src/cc_mapping/feature_selection/_preprocessing.py +0 -0
  14. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/src/cc_mapping/feature_selection/_random_forest.py +0 -0
  15. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/src/cc_mapping/feature_selection/_training.py +0 -0
  16. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/src/cc_mapping/manifold.py +0 -0
  17. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/src/cc_mapping/preprocess.py +0 -0
  18. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/src/cc_mapping/pseudotime.py +0 -0
  19. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/src/cc_mapping/thresholding/__init__.py +0 -0
  20. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/src/cc_mapping/thresholding/base.py +0 -0
  21. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/src/cc_mapping/thresholding/single.py +0 -0
  22. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/src/cc_mapping/utils.py +0 -0
  23. {cc_mapping-0.2.2 → cc_mapping-0.2.4}/src/cc_mapping/utils_v0.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: cc-mapping
3
- Version: 0.2.2
3
+ Version: 0.2.4
4
4
  Summary: Gaussian Mixture Model-based thresholding for single-cell gene expression analysis
5
5
  Home-page: https://github.com/StallaertLab/cc_mapping
6
6
  License: BSD-3-Clause
@@ -1,6 +1,6 @@
1
1
  [tool.poetry]
2
2
  name = "cc-mapping"
3
- version = "0.2.2"
3
+ version = "0.2.4"
4
4
  description = "Gaussian Mixture Model-based thresholding for single-cell gene expression analysis"
5
5
  authors = ["ddpoe <dap182@pitt.edu>"]
6
6
  readme = "README.md"
@@ -531,14 +531,21 @@ def combine_figures_with_gridspec(
531
531
  if fig.axes:
532
532
  source_ax = fig.axes[0]
533
533
 
534
- # Copy images, collections, lines, etc.
535
- for collection in source_ax.collections:
534
+ # Move artists from the source axes into the combined axes.
535
+ # Each Artist may belong to only ONE figure; calling add_*() on a
536
+ # second figure raises "Can not put single artist in more than one
537
+ # figure". Detach via .remove() first, then re-attach. list(...)
538
+ # snapshots so we don't mutate while iterating.
539
+ for collection in list(source_ax.collections):
540
+ collection.remove()
536
541
  ax_combined.add_collection(collection)
537
542
 
538
- for line in source_ax.lines:
543
+ for line in list(source_ax.lines):
544
+ line.remove()
539
545
  ax_combined.add_line(line)
540
546
 
541
- for patch in source_ax.patches:
547
+ for patch in list(source_ax.patches):
548
+ patch.remove()
542
549
  ax_combined.add_patch(patch)
543
550
 
544
551
  # Copy limits and properties
@@ -418,15 +418,26 @@ class SequentialGMM(GaussianMixtureModelBase):
418
418
  **gmm_kwargs
419
419
  )
420
420
  gmm.fit(subset_data.reshape(-1, 1))
421
-
421
+
422
+ # Sort GMM components by mean (low -> high) so column index matches the
423
+ # caller's ordered_labels convention (e.g. ['G1','S','G2'] = ascending
424
+ # DNA content). sklearn does NOT order components by mean, so without
425
+ # this sort, argmax(predict_proba) returns raw component indices that
426
+ # don't line up with the user-provided label order.
427
+ sort_order = np.argsort(gmm.means_.flatten())
428
+ sorted_means = gmm.means_.flatten()[sort_order]
429
+ sorted_covs = gmm.covariances_.flatten()[sort_order]
430
+ sorted_weights = gmm.weights_[sort_order]
431
+ sorted_data_probs = gmm.predict_proba(subset_data.reshape(-1, 1))[:, sort_order]
432
+
422
433
  # Extract GMM info
423
434
  gmm_info = _GaussianMixtureModelInfo(
424
435
  gmm_kwargs=gmm_kwargs,
425
- means=gmm.means_.flatten(),
426
- covs=gmm.covariances_.flatten(),
427
- weights=gmm.weights_,
436
+ means=sorted_means,
437
+ covs=sorted_covs,
438
+ weights=sorted_weights,
428
439
  n_components=n_components,
429
- data_probs=gmm.predict_proba(subset_data.reshape(-1, 1)),
440
+ data_probs=sorted_data_probs,
430
441
  )
431
442
 
432
443
  # Handle duplicate labels if needed.
File without changes
File without changes