various fixes in C files

[ape.git] / src / plot_phylo.c

diff --git a/src/plot_phylo.c b/src/plot_phylo.c
index a8b1ca3d35b054e559320295958b8d63a44a1e7b..d8666a20c83b156ba84fb2969abc124317fa5ae1 100644 (file)
--- a/src/plot_phylo.c
+++ b/src/plot_phylo.c
@@ -1,6 +1,6 @@
-/* plot_phylo.c (2006-10-13) */
+/* plot_phylo.c (2011-06-23) */
 
-/* Copyright 2004-2006 Emmanuel Paradis
+/* Copyright 2004-2011 Emmanuel Paradis
 
 /* This file is part of the R-package `ape'. */
 /* See the file ../COPYING for licensing issues. */
@@ -37,12 +37,11 @@ void node_depth(int *ntip, int *nnode, int *edge1, int *edge2,
 void node_height(int *ntip, int *nnode, int *edge1, int *edge2,
                int *nedge, double *yy)
 {
-    int i, k, n;
+    int i, n;
     double S;
 
     /* The coordinates of the tips have been already computed */
 
-    k = 1;
     S = 0;
     n = 0;
     for (i = 0; i < *nedge; i++) {
@@ -59,14 +58,13 @@ void node_height(int *ntip, int *nnode, int *edge1, int *edge2,
 void node_height_clado(int *ntip, int *nnode, int *edge1, int *edge2,
                       int *nedge, double *xx, double *yy)
 {
-    int i, k, n;
+    int i, n;
     double S;
 
     node_depth(ntip, nnode, edge1, edge2, nedge, xx);
 
     /* The coordinates of the tips have been already computed */
 
-    k = 1;
     S = 0;
     n = 0;
     for (i = 0; i < *nedge; i++) {
@@ -79,3 +77,18 @@ void node_height_clado(int *ntip, int *nnode, int *edge1, int *edge2,
        }
     }
 }
+
+void get_single_index_integer(int *x, int *val, int *index)
+{
+       while (x[*index] != *val) (*index)++;
+       *index += 1;
+}
+
+void get_two_index_integer(int *x, int *val, int *index)
+{
+       while (x[index[0]] != *val) index[0]++;
+       index[1] = index[0] + 1;
+       while (x[index[1]] != *val) index[1]++;
+       index[0] += 1;
+       index[1] += 1;
+}