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.

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

Tests, code coverage and some new functionality #43

Merged
merged 56 commits into from
Apr 9, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
15b4c62
Update DESCRIPTION
alanocallaghan Nov 8, 2016
9b89411
tests and add heatmaply class
alanocallaghan Nov 23, 2016
97a3bf1
Add native plotly support
alanocallaghan Feb 18, 2017
519408d
Add funtionality to move axis
alanocallaghan Feb 18, 2017
d531eee
Pull latest version
alanocallaghan Feb 18, 2017
904f0e3
Pull talgalili master
alanocallaghan Feb 18, 2017
0432318
Fix minor error
alanocallaghan Feb 18, 2017
3d857ab
Fix potential bug
alanocallaghan Feb 18, 2017
40a74c7
Fix R CMD check fails
alanocallaghan Feb 18, 2017
bd5d339
Fix CMD check warnings
alanocallaghan Feb 18, 2017
a1a71a5
Update docs
alanocallaghan Feb 18, 2017
e5cf94e
Fix minor CMD check warning
alanocallaghan Feb 18, 2017
66ba678
Test README
alanocallaghan Feb 22, 2017
81227ee
Add tests and change sidecolour interface
alanocallaghan Feb 22, 2017
35a2fad
Add matrix support
alanocallaghan Feb 22, 2017
98979ae
Add import
alanocallaghan Feb 22, 2017
894f843
Update docs
alanocallaghan Feb 22, 2017
e076560
Stupid typo
alanocallaghan Feb 22, 2017
80798a8
Bugfix and fix tests
alanocallaghan Feb 23, 2017
f786627
Update vignette
alanocallaghan Feb 26, 2017
2332b82
Begin to fix legend issue
alanocallaghan Mar 8, 2017
d270494
Several bugfixes and functionality adds re: native plotly
Mar 15, 2017
4a7e4f4
Retain dimnames names for matrix input
alanocallaghan Mar 21, 2017
f281048
Add long_data support
alanocallaghan Mar 22, 2017
398ab6f
Add label names to side_color_plot and tidy up
alanocallaghan Mar 22, 2017
83c3566
Bugfix
alanocallaghan Mar 22, 2017
2f39259
Move plots to file
alanocallaghan Mar 22, 2017
8e04d4c
Merge with codecov
alanocallaghan Mar 22, 2017
905078b
Bugfix
alanocallaghan Mar 22, 2017
557dfa8
Add text angle
alanocallaghan Mar 22, 2017
c8a679e
Remove class assignment
alanocallaghan Mar 22, 2017
54b7221
Remove guff
alanocallaghan Mar 22, 2017
11245b2
Explicit import
alanocallaghan Mar 22, 2017
d4f204f
Fix errors
alanocallaghan Mar 22, 2017
5d156ea
Remove unused test files
alanocallaghan Mar 22, 2017
1d8fed5
Fix description
alanocallaghan Mar 22, 2017
3bcbe2a
Add test for percentize
alanocallaghan Mar 23, 2017
246a628
Update heatmaply.Rmd
alanocallaghan Mar 30, 2017
2c27161
Update docs and namespace
alanocallaghan Apr 1, 2017
ca60e2f
Merge dimnames branch
alanocallaghan Apr 1, 2017
81aafe4
Cellnote implementation
alanocallaghan Apr 1, 2017
da937d9
Merge branch 'tests_plotly' of github.com:talgalili/heatmaply into te…
alanocallaghan Apr 1, 2017
23926ad
Update vignette
alanocallaghan Apr 1, 2017
8d538f8
Update docs and default for cellnote
alanocallaghan Apr 1, 2017
46ac6be
Update docs
alanocallaghan Apr 1, 2017
5954c1d
Merge from master
alanocallaghan Apr 1, 2017
ccf496c
Update docs
alanocallaghan Apr 1, 2017
b381057
Add font size parameter
alanocallaghan Apr 3, 2017
4129029
Update docs
alanocallaghan Apr 3, 2017
b41b2bd
Minor param name changes
alanocallaghan Apr 9, 2017
c7ae73b
Merge with master
alanocallaghan Apr 9, 2017
7333fce
Fix dupe
alanocallaghan Apr 9, 2017
a56d75d
Merge branch 'master' into tests_plotly
alanocallaghan Apr 9, 2017
884c723
Merge with master
alanocallaghan Apr 9, 2017
58335e1
Merge branch 'tests_plotly' of github.com:talgalili/heatmaply into te…
alanocallaghan Apr 9, 2017
bf72432
Rename cex_row param
alanocallaghan Apr 9, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
.Rhistory
.RData
TODO.txt
lib
*.html
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sudo: required
warnings_are_errors: true

after_success:
- Rscript -e 'covr::codecov()'
- Rscript -e 'library(covr); codecov()'

r_github_packages:
- hadley/testthat # for skip_if_not_installed
37 changes: 21 additions & 16 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,22 @@ Authors@R: c(person("Tal", "Galili", role = c("aut", "cre", "cph"), email =
person("Jonathan", "Sidi", email = "[email protected]", comment = "https://github.com/yonicd",role = "ctb"),
person("Alan", "O'Callaghan", comment = "https://github.com/Alanocallaghan",role = "ctb"),
person("Yoav", "Benjamini", email = "[email protected]",role = "ths"))
Description: Create interactive cluster 'heatmaps' that can be saved as a stand-alone HTML
file, embedded in 'R Markdown' documents or in a 'Shiny' apps, and available in the 'RStudio' viewer pane, .
Hover the mouse pointer over a cell to show details or drag a rectangle to
zoom. A 'heatmap' is a popular graphical method for visualizing high-dimensional
data, in which a table of numbers are encoded as a grid of colored cells. The
rows and columns of the matrix are ordered to highlight patterns and are often
accompanied by 'dendrograms'. 'Heatmaps' are used in many fields for visualizing
observations, correlations, missing values patterns, and more. Interactive
'heatmaps' allow the inspection of specific value by hovering the mouse over a
cell, as well as zooming into a region of the 'heatmap' by dragging a rectangle
around the relevant area. This work is based on the 'ggplot2' and 'plotly.js'
engine. It produces similar 'heatmaps' as 'heatmap.2' or 'd3heatmap', with the advantage of speed
('plotly.js' is able to handle larger size matrix), the ability to zoom from the 'dendrogram' panes,
and the placing of factor variables in the sides of the 'heatmap'.
Description: Create interactive cluster 'heatmaps' that can be saved as a stand-
alone HTML file, embedded in 'R Markdown' documents or in a 'Shiny' apps, and
available in the 'RStudio' viewer pane, . Hover the mouse pointer over a cell
to show details or drag a rectangle to zoom. A 'heatmap' is a popular graphical
method for visualizing high-dimensional data, in which a table of numbers
are encoded as a grid of colored cells. The rows and columns of the matrix
are ordered to highlight patterns and are often accompanied by 'dendrograms'.
'Heatmaps' are used in many fields for visualizing observations, correlations,
missing values patterns, and more. Interactive 'heatmaps' allow the inspection
of specific value by hovering the mouse over a cell, as well as zooming into
a region of the 'heatmap' by dragging a rectangle around the relevant area.
This work is based on the 'ggplot2' and 'plotly.js' engine. It produces
similar 'heatmaps' as 'heatmap.2' or 'd3heatmap', with the advantage of speed
('plotly.js' is able to handle larger size matrix), the ability to zoom from
the 'dendrogram' panes, and the placing of factor variables in the sides of the
'heatmap'.
Depends:
R (>= 3.0.0),
plotly (>= 4.5.2),
Expand All @@ -39,11 +41,14 @@ Imports:
colorspace,
RColorBrewer,
GGally,
htmlwidgets
htmlwidgets,
assertthat
Suggests:
knitr,
covr,
rmarkdown,
gplots
gplots,
testthat
VignetteBuilder: knitr
License: GPL-2 | GPL-3
URL: https://cran.r-project.org/package=heatmaply,
Expand Down
6 changes: 4 additions & 2 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@ export(YlGn)
export(YlGnBu)
export(YlOrBr)
export(YlOrRd)
export(ggheatmap)
export(heatmaply)
export(heatmapr)
export(is.heatmapr)
export(is.na10)
export(normalize)
export(percentize)
export(side_color_plot)
import(dendextend)
import(ggplot2)
importFrom(assertthat,assert_that)
importFrom(dendextend,as.ggdend)
importFrom(dendextend,color_branches)
importFrom(dendextend,find_k)
importFrom(dendextend,is.dendrogram)
Expand All @@ -53,10 +53,12 @@ importFrom(dendextend,rotate)
importFrom(dendextend,seriate_dendrogram)
importFrom(dendextend,set)
importFrom(htmlwidgets,saveWidget)
importFrom(plotly,add_segments)
importFrom(plotly,config)
importFrom(plotly,ggplotly)
importFrom(plotly,hide_colorbar)
importFrom(plotly,layout)
importFrom(plotly,plot_ly)
importFrom(plotly,plotly)
importFrom(plotly,plotly_empty)
importFrom(plotly,subplot)
Expand Down
85 changes: 0 additions & 85 deletions R/ggheatmap.R

This file was deleted.

Loading