diff -ruN old/hexbin/DESCRIPTION new/hexbin/DESCRIPTION --- old/hexbin/DESCRIPTION 2015-08-19 15:28:20.000000000 +0000 +++ new/hexbin/DESCRIPTION 2016-12-05 17:31:01.000000000 +0000 @@ -7,7 +7,7 @@ contains copies of lattice functions written by Deepayan Sarkar Maintainer: Edzer Pebesma -Depends: R (>= 2.0.1), methods +Depends: R (>= 2.10), methods Imports: lattice, grid, graphics, grDevices, stats, utils Suggests: marray, affy, Biobase, limma Description: Binning and plotting functions for hexagonal bins. Now @@ -20,6 +20,6 @@ License: GPL-2 NeedsCompilation: yes URL: http://github.com/edzer/hexbin -Packaged: 2015-08-19 15:11:53 UTC; edzer +Packaged: 2016-12-05 14:59:04 UTC; hornik Repository: CRAN -Date/Publication: 2015-08-19 17:28:20 +Date/Publication: 2016-12-05 18:28:47 diff -ruN old/hexbin/MD5 new/hexbin/MD5 --- old/hexbin/MD5 2015-08-19 15:28:20.000000000 +0000 +++ new/hexbin/MD5 2016-12-05 17:31:01.000000000 +0000 @@ -1,5 +1,5 @@ b8c6e7f6b0230cdf61f0976d387c7a44 *ChangeLog -58f0420f8288b4faae52aba21669bc3d *DESCRIPTION +f6c1be713daa2d4e03b9305c110b8c8b *DESCRIPTION 9129a733a21f780d50b1c3bb85da0047 *NAMESPACE 98a77d0235bb074f09aa7675358b8650 *R/BTC.R b8083617bec9ef2a20bf2fb31d1f50cb *R/BTY.R @@ -24,11 +24,11 @@ 449d6bbfb6927f39383b586ffce19eb1 *R/smoothHexbin.R 408e6e0599f15c991715933ddd85400f *README.md 53e586900ba0c452c12ec7aed3d20295 *TODO -dd1765c586720d0a4c7c5064fce7da74 *build/vignette.rds -cfa9343134507d8eaf7386167ea1243d *data/NHANES.rda -a6e0f6f67abc1c4d94ad6b2d33860fe2 *inst/doc/hexagon_binning.R -ed9dbcabcbb9240445d6dac2de22ba5f *inst/doc/hexagon_binning.Rnw -4550e584d1ad491edcb547bd4ec28845 *inst/doc/hexagon_binning.pdf +2e892a987d320b79d4d24d38841da103 *build/vignette.rds +b1cd56eeb8e12f4de5836516832dccf9 *data/NHANES.rda +c7f9911f661e2df4fb475e79e0b579bd *inst/doc/hexagon_binning.R +d6c9a9e05a1165a6e0da8b309303082b *inst/doc/hexagon_binning.Rnw +07f967932987a56bdd0a0ddf6be69e44 *inst/doc/hexagon_binning.pdf 3b3cb098160c79abc4d739397d315ff3 *man/NHANES.Rd bfc5169b22c653bb5912e9c3e92f3207 *man/colramp.Rd 94a1639600897389f489b6b836362d82 *man/erode.hexbin.Rd Binary files old/hexbin/build/vignette.rds and new/hexbin/build/vignette.rds differ Binary files old/hexbin/data/NHANES.rda and new/hexbin/data/NHANES.rda differ diff -ruN old/hexbin/inst/doc/hexagon_binning.R new/hexbin/inst/doc/hexagon_binning.R --- old/hexbin/inst/doc/hexagon_binning.R 2013-12-10 08:54:07.000000000 +0000 +++ new/hexbin/inst/doc/hexagon_binning.R 2016-12-05 14:59:04.000000000 +0000 @@ -3,7 +3,8 @@ ################################################### ### code chunk number 1: comphexsq ################################################### -library("hexbin")#,lib.loc="/home/nikko/R-devel/hex.devel/tst") +library("grid") +library("hexbin") x <- rnorm(1000) y <- rnorm(1000) ##-- Hexagon Bins: -- @@ -49,7 +50,7 @@ ################################################### -### code chunk number 3: hexagon_binning.Rnw:138-170 +### code chunk number 3: hexagon_binning.Rnw:139-171 ################################################### par(mfrow = c(3,1)) par(mai = c(.1667,0.2680,0.1667,0.2680)) ##par(mai=.25*par("mai")) @@ -156,7 +157,7 @@ ################################################### -### code chunk number 7: hbox +### code chunk number 7: hexagon_binning.Rnw:348-356 ################################################### data(NHANES) #grid.newpage() @@ -166,6 +167,11 @@ # convertHeight(unit(1,"npc"), "inches")) vpin <- c(unit(6,"inches"),unit(4, "inches")) shape <- optShape(height = vpin[2], width = vpin[1], mar = mai) + + +################################################### +### code chunk number 8: hbox +################################################### hb <- hexbin(NHANES$Transferin, NHANES$Hemoglobin, shape = shape) hbhp <- hboxplot(erode(hb,cdfcut = .05),unzoom = 1.3) pushHexport(hbhp,clip = 'on') @@ -174,7 +180,7 @@ ################################################### -### code chunk number 8: hdiff +### code chunk number 9: hdiff ################################################### #grid.newpage() shape <- optShape(height = vpin[2],width = vpin[1],mar = mai) @@ -186,12 +192,12 @@ hbM <- hexbin(NHANES$Transferin[NHANES$Sex == "M"], NHANES$Hemoglobin[NHANES$Sex == "M"], xbnds = xbnds, ybnds = ybnds, shape = shape) -plot.new() +#plot.new() hdiffplot(erode(hbF,cdfcut = .25),erode(hbM,cdfcut = .25),unzoom = 1.3) ################################################### -### code chunk number 9: marray1 +### code chunk number 10: marray1 ################################################### ### Need to redo this part. library("marray") @@ -221,7 +227,7 @@ ################################################### -### code chunk number 10: addto +### code chunk number 11: addto ################################################### hplt <- plot(hb1,style = 'centroid',border = gray(.65)) pushHexport(hplt$plot.vp) diff -ruN old/hexbin/inst/doc/hexagon_binning.Rnw new/hexbin/inst/doc/hexagon_binning.Rnw --- old/hexbin/inst/doc/hexagon_binning.Rnw 2013-12-10 08:54:07.000000000 +0000 +++ new/hexbin/inst/doc/hexagon_binning.Rnw 2015-07-11 15:07:11.000000000 +0000 @@ -65,10 +65,11 @@ of the grid. The following figure adapted from \cite[]{carretal}shows this effectively. -\begin{figure}[H] +\begin{figure}[h] \centering <>= -library("hexbin")#,lib.loc="/home/nikko/R-devel/hex.devel/tst") +library("grid") +library("hexbin") x <- rnorm(1000) y <- rnorm(1000) ##-- Hexagon Bins: -- @@ -133,7 +134,7 @@ nr <- length(fc.sq$x)/2 @ -\begin{figure}[H] +\begin{figure}[h] \centering << fig = TRUE,width = 4,height = 8,echo = FALSE >>= par(mfrow = c(3,1)) @@ -341,10 +342,10 @@ clinical factors. Here in Figure~\ref{hbox} we show the levels of transferin, a measure of iron binding against hemoglobin for all -\begin{figure}[H] +\begin{figure}[h] \centering -<< hbox, fig = TRUE, width = 6, height = 4, echo = FALSE >>= +<< echo = FALSE >>= data(NHANES) #grid.newpage() mar <- unit(0.1 + c(5,4,4,2),"lines") @@ -353,6 +354,9 @@ # convertHeight(unit(1,"npc"), "inches")) vpin <- c(unit(6,"inches"),unit(4, "inches")) shape <- optShape(height = vpin[2], width = vpin[1], mar = mai) +@ + +<< hbox, fig = TRUE, width = 6, height = 4, echo = FALSE >>= hb <- hexbin(NHANES$Transferin, NHANES$Hemoglobin, shape = shape) hbhp <- hboxplot(erode(hb,cdfcut = .05),unzoom = 1.3) pushHexport(hbhp,clip = 'on') @@ -381,7 +385,7 @@ Note that in the call to \texttt{hdiffplot} we erode the bins to calculate the bivariate medians, and only display the upper 75\% of the data. -\begin{figure}[H] +\begin{figure}[h] \centering << hdiff, fig = TRUE, width = 6, height = 4, echo = TRUE >>= #grid.newpage() @@ -394,7 +398,7 @@ hbM <- hexbin(NHANES$Transferin[NHANES$Sex == "M"], NHANES$Hemoglobin[NHANES$Sex == "M"], xbnds = xbnds, ybnds = ybnds, shape = shape) -plot.new() +#plot.new() hdiffplot(erode(hbF,cdfcut = .25),erode(hbM,cdfcut = .25),unzoom = 1.3) @ \caption{A difference plot of transferin vs hemoglobin for males and females.} Binary files old/hexbin/inst/doc/hexagon_binning.pdf and new/hexbin/inst/doc/hexagon_binning.pdf differ