[Phylobase-commits] r857 - pkg/src

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

Author: francois
Date: 2014-03-10 00:31:00 +0100 (Mon, 10 Mar 2014)
New Revision: 857

Modified:
   pkg/src/checkPhylo4.cpp
   pkg/src/symbols.rds
Log:
fix tabulateTips in C++ code (was wrong version of file).

Modified: pkg/src/checkPhylo4.cpp
===================================================================
--- pkg/src/checkPhylo4.cpp	2014-03-09 21:31:45 UTC (rev 856)
+++ pkg/src/checkPhylo4.cpp	2014-03-09 23:31:00 UTC (rev 857)
@@ -50,9 +50,10 @@
 // tabulates ancestor nodes that are not the root.
     int n = Rcpp::max(ances);
     std::vector<int> ans(n);
-    for (int i=0; i < n; i++) {
-        if (i > 0) {
-            ans[i - 1]++;
+    for (int i=0; i < ances.size(); i++) {
+        int j = ances[i];
+        if (j > 0) {
+            ans[j - 1]++;
         }
     }
     return ans;

Modified: pkg/src/symbols.rds
===================================================================
(Binary files differ)