X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fdist_dna.c;h=f10bc4debeacd4b8acf7d80da75af5913b3d0b63;hb=6dfbab243973c0c3fa2e6d02b190aefbe5a67280;hp=4e02393334a11ccd8d749294e19cff9d6a41f9f1;hpb=fc23a549d88857c3f4c82b4e0a9ced45af2ecc57;p=ape.git

diff --git a/src/dist_dna.c b/src/dist_dna.c
index 4e02393..f10bc4d 100644
--- a/src/dist_dna.c
+++ b/src/dist_dna.c
@@ -1,6 +1,6 @@
-/* dist_dna.c       2007-12-01 */
+/* dist_dna.c       2008-01-19 */
 
-/* Copyright 2005-2007 Emmanuel Paradis
+/* Copyright 2005-2008 Emmanuel Paradis
 
 /* This file is part of the R-package `ape'. */
 /* See the file ../COPYING for licensing issues. */
@@ -988,27 +988,6 @@ void SegSites(unsigned char *x, int *n, int *s, int *seg)
     }
 }
 
-void NucleotideDiversity(unsigned char *x, int *n, int *s,
-			 int *pairdel, double *ans)
-{
-    int i1, i2, s1, s2, Nd, L;
-
-    if (!*pairdel) L = *s;
-
-    for (i1 = 1; i1 < *n; i1++) {
-        for (i2 = i1 + 1; i2 <= *n; i2++) {
-	    Nd = 0;
-	    if (*pairdel) L = 0;
-	    for (s1 = i1 - 1, s2 = i2 - 1; s1 < i1 + *n*(*s - 1); s1+= *n, s2 += *n) {
-                CHECK_PAIRWISE_DELETION
-		if (DifferentBase(x[s1], x[s2])) Nd++;
-	    }
-	    *ans += ((double) Nd/L);
-	}
-    }
-    *ans /= (*n * (*n - 1)/2);
-}
-
 void GlobalDeletionDNA(unsigned char *x, int *n, int *s, int *keep)
 {
     int i, j;