Skip to content
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

Jump to bottom

Overlay for RDM plot #355

Merged
merged 41 commits into from
Nov 3, 2023
Merged

Overlay for RDM plot #355

merged 41 commits into from
Nov 3, 2023

Conversation

JasperVanDenBosch
Copy link
Contributor

@JasperVanDenBosch JasperVanDenBosch commented Oct 14, 2023 •
edited
Loading

resolves #341

goals

  • refactor current code
  • implement overlay
  • implement contour
  • contour: multiple clusters
  • Option to only apply to lower triangle

wishlist / delay

  • refactoring: merge overlap between single and multi
  • OOP access for all properties
  • OOP init for single rdm plot
  • Suptitle for show_rdms #351

also look into

@JasperVanDenBosch
rdm_plot uses new function to access mplstyle resource
5b45496
@JasperVanDenBosch
meadows.io tests adapted to use importlib instead of pkg_resources
45edc10
@JasperVanDenBosch
require importlib backport for python 3.8
a60d0df
@JasperVanDenBosch
specify specific version of importlib backport comp w 3.12
8277c5a
@JasperVanDenBosch
use importlib backport in tests
8fc361b
@JasperVanDenBosch
MDS normalized stress parameter specified
07ed1af
@JasperVanDenBosch
plot commands for all sections of rdm plot demo
ab4cf09
@JasperVanDenBosch
dont add (ranks) to measure twice
20820e6
@JasperVanDenBosch
potential new demo for overlay and contour
ae6f61c
@JasperVanDenBosch
separate tests for rdm_plot
917c179
@JasperVanDenBosch
Configuration class to encapsulate building of rdm_plot options
8d393ef
@JasperVanDenBosch
refactored *descriptor_labels functions
0811c9e
@JasperVanDenBosch
removed references to add_descriptor_x_label / y for external use
7c0614d
@JasperVanDenBosch
refactored single rdm plot
f743e87
@JasperVanDenBosch
batch_to_vectors() clarified returns
deb7a73
@JasperVanDenBosch
testing choice of rows and columns on rdm plot
3b07b32
@JasperVanDenBosch
using simple enum as StrEnum is only supported from 3.11
5bce727
@JasperVanDenBosch
some style fixes
04cde97
@JasperVanDenBosch
fixed figure-level colorbar handle
79e29f9
@JasperVanDenBosch
fixed whitespace
a43514f
@JasperVanDenBosch
overlay and contour arguments in demo
d8ee93b
@JasperVanDenBosch
tweaks to pylint
d8a8524
@JasperVanDenBosch
further refactored rdm_plot init
7339b1f
@JasperVanDenBosch
added new arguments to show_rdm
1f25a1b
@JasperVanDenBosch
from_show_rdm_args test sets default args
5a238f7
@JasperVanDenBosch
MultiRdmPlot deals with new arguments
4b03de6
@JasperVanDenBosch
contour and overlay args on single rdm plot
b1b6571
@JasperVanDenBosch
style fixes
add6cc2
@JasperVanDenBosch
implemented overlay
bce268c
@JasperVanDenBosch
contour mpl logic
bb0166a
@JasperVanDenBosch
Copy link
Contributor Author

Ready for review. There's room for improvement here, mostly refactoring to remove duplication, and make the plots fully functional for OOP access. I suggest we file these for later.

Here's a preview of the new demo: https://rsatoolbox--355.org.readthedocs.build/en/355/demo_annotated_rdm_plot.html

@JasperVanDenBosch JasperVanDenBosch marked this pull request as ready for review October 31, 2023 12:57
@JasperVanDenBosch
Copy link
Contributor Author

JasperVanDenBosch commented Nov 1, 2023 •
edited
Loading

@HeikoSchuett when you have a chance can you have a look at the approach I took in rdm_plot? The idea is to separate the pure matplotlib stuff from our own logic in order to make it more maintainable. The existing interface with optional arguments is supported, as well as some work on a new object-based way to build the plots. If you're happy I think this is ready to merge

@JasperVanDenBosch JasperVanDenBosch merged commit 45a79c1 into main Nov 3, 2023
17 checks passed
@JasperVanDenBosch JasperVanDenBosch deleted the rdm-plot-overlay branch November 3, 2023 15:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@HeikoSchuett HeikoSchuett Awaiting requested review from HeikoSchuett

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

RDM plot overlay or highlight
1 participant
@JasperVanDenBosch