version 1.13

cran · May 13, 2015 · 8a3678f · 8a3678f
1 parent 8ffde54
commit 8a3678f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Changes from Version 1.12 to 1.13 [May 13 2015]
+
+* Removing smartlegend() calls (deprecated in new version of gplot) in calc_ehh.R and fistribplot.R
+
 Changes from Version 1.11 to 1.12 [Apr 7 2015]
 
 * Minor modification of the CITATION file

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: rehh
 Maintainer: Mathieu Gautier <[email protected]>
 Author: Mathieu Gautier and Renaud Vitalis
-Version: 1.12
+Version: 1.13
 License: GPL (>= 2)
 Title: Searching for Footprints of Selection using Haplotype
         Homozygosity Based Tests
@@ -12,7 +12,7 @@ Description: Functions for the detection of footprints of selection on
         statistics. Various plotting functions are also included to
         facilitate visualization and interpretation of the results.
 Depends: R (>= 2.10), gplots, methods
-Packaged: 2015-04-07 12:59:15 UTC; mathieu
 NeedsCompilation: yes
+Packaged: 2015-05-13 14:36:55 UTC; mathieu
 Repository: CRAN
-Date/Publication: 2015-04-07 16:01:24
+Date/Publication: 2015-05-13 19:54:58
diff --git a/MD5 b/MD5
@@ -1,11 +1,11 @@
-b01eb9aec55f1736b80b659514510c93 *ChangeLog
-1f708ce58f955564cb76e06f9560bda9 *DESCRIPTION
+6984428c4aa45239a5a0b97e84240d5b *ChangeLog
+eb7e311e133b8ff8b8f1dee961730365 *DESCRIPTION
 bcdae995c3c93898c7f6adc04767cc5c *NAMESPACE
 66b19d927cd1910977ea9a424e808f09 *R/bifurcation.diagram.R
-5e13ba818983b8cb2227f593209f0ad2 *R/calc_ehh.R
+67d44ad2dea81d0183e1cab53a577563 *R/calc_ehh.R
 f2ff441060f34c66e0ae54153d83468f *R/calc_ehhs.R
 ae6d29a3c3fd66aba573924440851407 *R/data2haplohh.R
-dba4ffd5df7da5f97536e7205e28ceb9 *R/distribplot.R
+b4bc9634a424e3aa52346765577a964d *R/distribplot.R
 85a4171cae44228896492839af39bb68 *R/ies2rsb.R
 b76e82e3b88c8c45377c0cc854bff0d2 *R/ihh2ihs.R
 662baf5629173558243cd7219a1926dd *R/ihsplot.R

diff --git a/R/calc_ehh.R b/R/calc_ehh.R
@@ -30,7 +30,7 @@ calc_ehh<-function(haplohh,mrk,limhaplo=2,limehh=0.05,plotehh=TRUE,main_leg="EHH
      matplot(haplohh@position[sel_reg],t(ehh[,sel_reg]),col=c("red","blue"),lty=1,
              type="l",main=main_leg,bty="n",xlab="Position",ylab="EHH")
      abline(v=haplohh@position[mrk],lty=2)
-     smartlegend("left","top",c("Anc. Allele","Der. Allele"),col=c("red","blue"),bty="n",lty=1)
+     legend("left","top",c("Anc. Allele","Der. Allele"),col=c("red","blue"),bty="n",lty=1)
    }
    }
 

diff --git a/R/distribplot.R b/R/distribplot.R
@@ -1,5 +1,5 @@
 distribplot<-function(data,col=c("blue","red"),main="iHS distribution",xlab="iHS"){
      plot(density(data,na.rm=T),main=main,xlab="iHS",col=col[1])
      curve(dnorm,col=col[2],add=T)
-     smartlegend("right","top",c("Observed","Gaussian"),fill=col)
+     legend("right","top",c("Observed","Gaussian"),fill=col)
   }