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

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

Author: jombart
Date: 2008-06-13 12:33:59 +0200 (Fri, 13 Jun 2008)
New Revision: 123

Modified:
   pkg/DESCRIPTION
   pkg/R/setAs.R
Log:
Fixed setAs and DESCRIPTION.


Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2008-06-12 16:05:18 UTC (rev 122)
+++ pkg/DESCRIPTION	2008-06-13 10:33:59 UTC (rev 123)
@@ -9,4 +9,4 @@
 Description: Classes and functions for genetic data analysis within the multivariate framework.
 License: GPL (>=2)
 LazyLoad: yes
-Collate: classes.R auxil.R makefreq.R chooseCN.R dist.genpop.R export.R setAs.R gstat.randtest.R HWE.R import.R monmonier.R coords.monmonier.R spca.R spca.rtests.R zzz.R hybridize.R fstat.R propShared.R
\ No newline at end of file
+Collate: classes.R auxil.R makefreq.R chooseCN.R dist.genpop.R export.R setAs.R gstat.randtest.R HWE.R import.R monmonier.R coords.monmonier.R spca.R spca.rtests.R zzz.R hybridize.R fstat.R propShared.R scale.R
\ No newline at end of file

Modified: pkg/R/setAs.R
===================================================================
--- pkg/R/setAs.R	2008-06-12 16:05:18 UTC (rev 122)
+++ pkg/R/setAs.R	2008-06-13 10:33:59 UTC (rev 123)
@@ -2,13 +2,13 @@
 # S4 methods
 #############
 setAs("genind", "data.frame", function(from, to) {
-    return(from at tab)
+    return(as.data.frame(from at tab))
 })
 
 
 
 setAs("genpop", "data.frame", function(from, to) {
-    return(from at tab)
+    return(as.data.frame(from at tab))
 })