-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Hwinata test dendrogram #134
Merged
Merged
Changes from all commits
Commits
Show all changes
61 commits
Select commit
Hold shift + click to select a range
e0d14a1
Refactor dplyr tree segment adjustment
dan-knight 5c094e2
Remove unused duplicate function
dan-knight 6f9bbc2
Refactor dplyr tree segment initialization
dan-knight 169e01a
Refactor text prep dplyr functions
dan-knight 074c215
Refactor dplyr function in tree length adjustment
dan-knight e0f3c23
Remove unused duplicate function
dan-knight 3585423
Remove unused code
dan-knight 1e3e207
Refactor dplyr function in node text
dan-knight 156b341
Remove plyr dependency
dan-knight 3293d62
Update changelog
dan-knight 0f351fe
add heatmaps documentation
whelena 18e415a
Merge branch 'main' of github.com:uclahs-cds/public-R-CancerEvolution…
whelena 82142a2
add documentation for create.ccf.summary.heatmap
whelena 3cca6d4
add documentation for create.clone.genome.distribution.plot
whelena 7aed2a0
fix lintr
whelena ba611d5
standardize param names
whelena 98c53c6
add colour scheme param to create.cluster.heatmap
whelena d828b33
automate naming between multi and single sample for clone genome dist…
whelena ccc59f4
Merge branch 'danknight-circular-angles' of github.com:uclahs-cds/pub…
whelena 7da2776
simplify filenames
whelena 068b046
update NEWS
whelena abc23bf
match argument name in .Rd file
whelena 861ca49
fix param documentation
whelena eb119f3
Merge branch 'dendrogram' of github.com:uclahs-cds/public-R-CancerEvo…
whelena 90afed7
add some notes
whelena cf429d6
modify angle assignment for dendrogram mode
whelena c966207
add check to make sure all children are given the same parent
whelena 2933a2b
option 2 of assigning dendrogram angles
whelena 77162d7
refactor calculate.angles.radial to handle different modes
whelena cd12ddd
fix dendrogram dx calculation
whelena 48fed2f
fix refatoring to use with full radial and full dend mode
whelena 02ca32c
remove print and allow spread to modify x dist between nodes
whelena 47f28f3
update NEWS and test + fix lintr
whelena db04c33
Update changelog format to markdown
dan-knight 013a84a
Update changelog
dan-knight fb4e1a8
Fix documentation
dan-knight 2d27a49
Update changelog
dan-knight a3386ac
Merge pull request #129 from uclahs-cds/hwinata-add-documentation
dan-knight c1dcb67
Merge branch 'main' of github.com:uclahs-cds/package-CancerEvolutionV…
dan-knight d622beb
Remove stringr dependency
dan-knight 98bc106
Update changelog
dan-knight f83b0ae
Merge branch 'main' of github.com:uclahs-cds/package-CancerEvolutionV…
dan-knight efb60c2
Reimplement stringr filtering function
dan-knight 2424b79
Merge pull request #136 from uclahs-cds/danknight-dplyr
dan-knight 5dd6a7c
Merge branch 'main' of github.com:uclahs-cds/package-CancerEvolutionV…
dan-knight 72a51a9
Merge pull request #135 from uclahs-cds/danknight-news-md
dan-knight 09517cb
Merge branch 'main' of github.com:uclahs-cds/public-R-CancerEvolution…
whelena 658240d
Fix bug in radial angle calculation
dan-knight d163f9f
Refactor adply implementation
dan-knight cb5cbcf
Fix code style
dan-knight 6950f1c
Update function imports from base R
dan-knight 5161148
Fix typo
dan-knight 268d865
Fix bug when creating tree segments
dan-knight e768364
Handle types when calculating seg coords
dan-knight 5b013a5
Dendrogram regression/E2E test case
dan-knight 97e8944
Merge branch 'dendrogram' into hwinata-test-dendrogram
dan-knight 5560b18
Refactor equal X-dist
dan-knight ceb4bed
Update dendrogram regression test
dan-knight 5300cc0
Revert "Refactor equal X-dist"
whelena 6ec021e
save reverted version with edits
whelena 82d349e
edit dendrogram expected test result
whelena File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
Package: CancerEvolutionVisualization | ||
Title: Publication Quality Phylogenetic Tree Plots | ||
Version: 3.0.0 | ||
Date: 2024-05-07 | ||
Version: 2.1.0 | ||
Date: 2024-07-31 | ||
Authors@R: c( | ||
person("Paul Boutros", role = "cre", email = "[email protected]"), | ||
person("Adriana Salcedo", role = "aut"), | ||
|
@@ -14,15 +14,13 @@ URL: https://github.com/uclahs-cds/package-CancerEvolutionVisualization | |
BugReports: https://github.com/uclahs-cds/package-CancerEvolutionVisualization/issues | ||
Depends: | ||
R (>= 3.5.0), | ||
graphics, | ||
graphics, | ||
grid, | ||
gridExtra, | ||
gtable, | ||
Imports: | ||
plyr, | ||
grDevices, | ||
utils, | ||
stringr, | ||
BoutrosLab.plotting.general | ||
Suggests: | ||
testthat, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why are we reverting back to 2.1?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch. I think Git was confused about which change took priority. I'll change it to 3.0.0.