[adegenet-commits] r1017 - in pkg: . R

[noreply at r-forge.r-project.org]

Author: jombart
Date: 2012-07-09 17:45:06 +0200 (Mon, 09 Jul 2012)
New Revision: 1017

Modified:
   pkg/DESCRIPTION
   pkg/R/haploGen.R
Log:
Added new dep. with igraph


Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2012-07-09 14:07:15 UTC (rev 1016)
+++ pkg/DESCRIPTION	2012-07-09 15:45:06 UTC (rev 1017)
@@ -10,6 +10,6 @@
 Suggests: genetics, spdep, tripack, ape, pegas, seqinr, adehabitat, multicore, akima, maps, splancs, igraph
 Depends: R (>= 2.10), methods, MASS, ade4
 Description: Classes and functions for genetic data analysis within the multivariate framework.
-Collate: classes.R basicMethods.R handling.R auxil.R setAs.R SNPbin.R glHandle.R glFunctions.R glSim.R find.clust.R hybridize.R scale.R fstat.R import.R seqTrack.R chooseCN.R genind2genpop.R loadingplot.R sequences.R gstat.randtest.R makefreq.R colorplot.R monmonier.R spca.R coords.monmonier.R haploGen.R old2new.R spca.rtests.R dapc.R haploPop.R PCtest.R dist.genpop.R Hs.R propShared.R export.R HWE.R propTyped.R inbreeding.R glPlot.R zzz.R
+Collate: classes.R basicMethods.R handling.R auxil.R setAs.R SNPbin.R glHandle.R glFunctions.R glSim.R find.clust.R hybridize.R scale.R fstat.R import.R seqTrack.R chooseCN.R genind2genpop.R loadingplot.R sequences.R gstat.randtest.R makefreq.R colorplot.R monmonier.R spca.R coords.monmonier.R haploGen.R old2new.R spca.rtests.R dapc.R haploPop.R PCtest.R dist.genpop.R Hs.R propShared.R export.R HWE.R propTyped.R inbreeding.R glPlot.R gengraph.R zzz.R
 License: GPL (>=2)
 LazyLoad: yes

Modified: pkg/R/haploGen.R
===================================================================
--- pkg/R/haploGen.R	2012-07-09 14:07:15 UTC (rev 1016)
+++ pkg/R/haploGen.R	2012-07-09 15:45:06 UTC (rev 1017)
@@ -564,10 +564,13 @@
 
 
 
+######################
+## as.igraph.haploGen
+######################
 as.igraph.haploGen <- function(x, ...){
     if(!require(igraph)) stop("package igraph is required for this operation")
     if(!require(ape)) stop("package ape is required for this operation")
-    if(!require(ade4)) stop("package ape is required for this operation")
+    ## if(!require(ade4)) stop("package ape is required for this operation")
 
     ## GET DAG ##
     from <- x$ances