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

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

Author: jombart
Date: 2008-07-30 12:14:22 +0200 (Wed, 30 Jul 2008)
New Revision: 160

Modified:
   pkg/ChangeLog
   pkg/DESCRIPTION
   pkg/R/spca.R
Log:
Bug fix (appears in R-devel)


Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog	2008-07-23 13:09:55 UTC (rev 159)
+++ pkg/ChangeLog	2008-07-30 10:14:22 UTC (rev 160)
@@ -1,3 +1,19 @@
+			CHANGES IN ADEGENET VERSION 1.2-1
+
+
+NEW FEATURES
+
+	o documentation of scaleGen provides an example of usefulness of
+	an appropriate scaling in PCA
+
+BUG FIXES
+
+	o fixed the recognition of NAs in df2genind
+
+	o fixed the call to inherits in spca (returned value changes in R-devel)
+
+
+
 			CHANGES IN ADEGENET VERSION 1.2-0
 
 
@@ -21,8 +37,6 @@
 	o implemented propTyped, a function giving the proportion of
 	non-missing data in different ways.
 
-
-
 BUG FIXES
 
 	o missing data indicated in summary corrected (loci with more

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2008-07-23 13:09:55 UTC (rev 159)
+++ pkg/DESCRIPTION	2008-07-30 10:14:22 UTC (rev 160)
@@ -1,6 +1,6 @@
 Package: adegenet
 Version: 1.2-1
-Date: 2008/07/08
+Date: 2008/07/30
 Title: adegenet: a R package for the multivariate analysis of genetic markers.
 Author: Thibaut Jombart <jombart at biomserv.univ-lyon1.fr>, with contributions from Peter Solymos
 Maintainer: Thibaut Jombart <jombart at biomserv.univ-lyon1.fr>

Modified: pkg/R/spca.R
===================================================================
--- pkg/R/spca.R	2008-07-23 13:09:55 UTC (rev 159)
+++ pkg/R/spca.R	2008-07-30 10:14:22 UTC (rev 160)
@@ -20,7 +20,7 @@
                  ask=TRUE, plot.nb=TRUE, edit.nb=FALSE ,truenames=TRUE, d1=NULL, d2=NULL, k=NULL,
                  a=NULL, dmin=NULL) {
   
-  if(!inherits(obj,c("genind","genpop"))) stop("obj must be a genind or genpop object.")
+  if(!any(inherits(obj,c("genind","genpop")))) stop("obj must be a genind or genpop object.")
   invisible(validObject(obj))
 
   ## spatial coordinates