[adegenet-commits] r1142 - pkg

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

Author: jombart
Date: 2013-06-06 16:26:07 +0200 (Thu, 06 Jun 2013)
New Revision: 1142

Modified:
   pkg/DESCRIPTION
   pkg/NAMESPACE
Log:
Fixed declaration of dependencies

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2013-06-05 17:40:15 UTC (rev 1141)
+++ pkg/DESCRIPTION	2013-06-06 14:26:07 UTC (rev 1142)
@@ -5,8 +5,8 @@
 Author:  Thibaut Jombart, Ismail Ahmed, Federico Calboli, Anne Cori, Tobias Erik Reiners, Peter Solymos
 Maintainer: Thibaut Jombart <t.jombart at imperial.ac.uk>
 Suggests: genetics, spdep, tripack, pegas, seqinr, adehabitat, parallel, akima, maps, splancs, hierfstat
-Depends: R (>= 2.14), ade4
-Imports: methods, MASS, igraph, ape
+Depends: R (>= 2.14), ade4, methods
+Imports: utils, stats, MASS, igraph, ape
 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 xvalDapc.R haploPop.R PCtest.R dist.genpop.R Hs.R propShared.R export.R HWE.R propTyped.R inbreeding.R glPlot.R gengraph.R simOutbreak.R mutations.R zzz.R
 License: GPL (>=2)

Modified: pkg/NAMESPACE
===================================================================
--- pkg/NAMESPACE	2013-06-05 17:40:15 UTC (rev 1141)
+++ pkg/NAMESPACE	2013-06-06 14:26:07 UTC (rev 1142)
@@ -3,11 +3,25 @@
 exportPattern(".")
 
 ## Export all classes
-exportClassPattern(".")
+exportPattern("^[^\\.]")
 
 ## Import all packages listed as Imports or Depends
-import(utils,methods,MASS,ade4,igraph,ape)
+import(methods,ade4)
 
+importFrom(utils, "packageDescription")
+
+importFrom(stats, "kmeans")
+
+importFrom(MASS, "lda")
+
+importFrom(ape, "as.character.DNAbin", "as.DNAbin", "as.DNAbin.alignment", "as.DNAbin.character",
+           "as.DNAbin.list", "as.list.DNAbin", "as.matrix.DNAbin", "cbind.DNAbin", "c.DNAbin",
+           "[.DNAbin", "labels.DNAbin", "print.DNAbin", "rbind.DNAbin", "dist.dna")
+
+importFrom(igraph, "graph.data.frame", "V", "V<-", "E", "E<-", "layout.fruchterman.reingold",
+           "as.igraph", "plot.igraph", "print.igraph", "graph.adjacency", "clusters")
+
+
 ## Declare S3 methods
 S3method(scatter, dapc)
 S3method(scatter, glPca)