Conversation
| #' "none" (the default order produced by the dendrogram), | ||
| #' "GW" (Gruvaeus and Wainer heuristic to optimize the Hamiltonian path length that is restricted by the dendrogram structure) | ||
| #' | ||
| #' "GW" (Gruvaeus and Wainer heuristic to optimze the Hamiltonian path length that is restricted by the dendrogram structure) |
| @@ -1,3 +1,5 @@ | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
No need to fix this since I create NEWS.md automatically from NEWS.
| well as the tick labels. | ||
|
|
||
|
|
||
| ======= |
| ================ | ||
|
|
||
|
|
||
| ### NEW FEATURES |
There was a problem hiding this comment.
This should probably be kept here.
| if (!is.null(col)) colors <- col | ||
|
|
||
| if (is.null(scale_fill_gradient_fun)) { | ||
| if (node_type == "heatmap") { |
There was a problem hiding this comment.
Both scale_fill_gradient_fun seem identical to me, so why the if (node_type == "heatmap")?
There was a problem hiding this comment.
scale_fill_gradientn and scale_color_gradientn
| #' "none" (the default order produced by the dendrogram), | ||
| #' "GW" (Gruvaeus and Wainer heuristic to optimize the Hamiltonian path length that is restricted by the dendrogram structure) | ||
| #' | ||
| #' "GW" (Gruvaeus and Wainer heuristic to optimze the Hamiltonian path length that is restricted by the dendrogram structure) |
| @@ -104,19 +104,19 @@ heatmaplyWelcomeMessage <- function() { | |||
|
|
|||
There was a problem hiding this comment.
These changes are rolling back some fixes I've made. Please change them back.
There was a problem hiding this comment.
My fault! Wasn't sure which was which :)
There was a problem hiding this comment.
Hi Allan,
There seems to be a few changes introduced in this commit that are changing back minor fixes I've made. Please give them a look. Thanks.
|
Sure - I still found a large diff after running stylr, most of it was unintentional. Would appreciate a heads up before reformatting large amounts of the code |
|
I'm sorry Alan, you're right, I should have emailed you at the time, I apologize. Cheers, |
|
My fault for leaving merge requests so long! Should be fixed now, but feel free to have another look. I'll merge at the weekend unless you have any objections |
| - removing tick labels with `showticklabels` now removes the ticks as | ||
| well as the tick labels. | ||
| - Prevent grid_gap warning (#105) | ||
| - Add `cellnote_size` argument, controlling the font size of the cellnote. |
There was a problem hiding this comment.
I think this is a new feature and not a bug fix (please revert this edit to what was before in the file)
| } else { | ||
| assert_that(length(label_names) == 3) | ||
| } | ||
| melt_df <- function(x, label_names) { |
There was a problem hiding this comment.
Might it be better to place this function outside of ggplot_heatmap?
|
@alanocallaghan I reviewed the code (although I didn't test that it works, but I trust you have), so I'm fine with you including it. Lastly, I believe the only major change I see in the future is deciding that the names of our function arguments are agreed upon (and changing the version to 1.0.0). I suspect that if we'd like to change anything, that would be a major code change that should not be done while having too active alternative forks. Yours, |
|
Hi @alanocallaghan - just wanted to ping and check if there is any issue with moving forward on merging this branch (it is not urgent by any means, I was just curious). Yours, |
|
Hi tal,
Yep, will merge this week, apologies
On 17 Dec 2017 9:14 pm, Tal Galili <notifications@github.com> wrote:
Hi @alanocallaghan<https://github.com/alanocallaghan> - just wanted to ping and check if there is any issue with moving forward on merging this branch (it is not urgent by any means, I was just curious).
Yours,
Tal
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub<#133 (comment)>, or mute the thread<https://github.com/notifications/unsubscribe-auth/AKR8KIUflXeFo0xahGpX-wBzoliQWbE4ks5tBYQsgaJpZM4Q24I1>.
|
Codecov Report
@@ Coverage Diff @@
## master #133 +/- ##
==========================================
+ Coverage 92.23% 92.68% +0.44%
==========================================
Files 8 8
Lines 1340 1436 +96
==========================================
+ Hits 1236 1331 +95
- Misses 104 105 +1
Continue to review full report at Codecov.
|
Superset of #127, #98