[adegenet-commits] r660 - pkg/R www www/files

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

Author: jombart
Date: 2010-09-08 16:12:52 +0200 (Wed, 08 Sep 2010)
New Revision: 660

Added:
   www/files/adegenet_1.2-5.tar.gz
   www/files/adegenet_1.2-5.tgz
   www/files/adegenet_1.2-5.zip
Modified:
   pkg/R/fstat.R
   www/download.html
Log:
Added sources/binaries of the current stable version.


Modified: pkg/R/fstat.R
===================================================================
--- pkg/R/fstat.R	2010-09-08 10:54:34 UTC (rev 659)
+++ pkg/R/fstat.R	2010-09-08 14:12:52 UTC (rev 660)
@@ -25,22 +25,27 @@
 
 
 
-## ###############
-## # fst function
-## ###############
-## #
-## # classical fst sensu Weir 1996 Genetic data analysis II pp. 166-167
-## #
-## fst <- function(x, pop=NULL){
-##     ## misc checks
-##     if(!is.genind(x)) stop("x is not a valid genind object")
-##     if(!require(hierfstat)) stop("hierfstat package is required. Please install it.")
 
-##     if(is.null(pop)) pop <- x at pop
-##     if(is.null(pop)) stop("no pop factor provided")
-##     if(length(pop)!=nrow(x at tab)) stop("pop has a wrong length.")
 
-##     ## computations
 
-##     return(res)
-## }
+###############
+# fst function
+###############
+#
+# classical fst sensu Nei
+#
+pairwise.fst <- function(x, pop=NULL){
+    ## MISC CHECKS ##
+    if(!is.genind(x)) stop("x is not a valid genind object")
+
+    if(is.null(pop)) pop <- pop(x)
+    if(is.null(pop)) stop("no pop factor provided")
+    if(length(pop)!=nrow(x at tab)) stop("pop has a wrong length.")
+
+
+    ## COMPUTATIONS ##
+
+
+
+    return(res)
+} # end of pairwise.fst

Modified: www/download.html
===================================================================
--- www/download.html	2010-09-08 10:54:34 UTC (rev 659)
+++ www/download.html	2010-09-08 14:12:52 UTC (rev 660)
@@ -20,9 +20,9 @@
 <span style="font-weight: bold;">current stable version</span>
 (adegenet_1.2-5)
 is available as:<br>
-- linux/unix sources<br>
-- MacOS X binary<br>
-- Windows binary<br>
+- <a href="files/adegenet_1.2-5.tar.gz">linux/unix sources</a><br>
+- <a href="files/adegenet_1.2-5.tgz">MacOS X binary</a><br>
+- <a href="files/adegenet_1.2-5.zip">Windows binary</a><br>
 <br>
 <img alt="" src="images/bullet.png" style="width: 10px; height: 10px;">
 The

Added: www/files/adegenet_1.2-5.tar.gz
===================================================================
(Binary files differ)


Property changes on: www/files/adegenet_1.2-5.tar.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: www/files/adegenet_1.2-5.tgz
===================================================================
(Binary files differ)


Property changes on: www/files/adegenet_1.2-5.tgz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: www/files/adegenet_1.2-5.zip
===================================================================
(Binary files differ)


Property changes on: www/files/adegenet_1.2-5.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream