[Phylobase-commits] r753 - pkg/src

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

Author: francois
Date: 2010-03-11 23:38:02 +0100 (Thu, 11 Mar 2010)
New Revision: 753

Modified:
   pkg/src/NCLInterface.cpp
Log:
fixes bug that ignored excluded characters

Modified: pkg/src/NCLInterface.cpp
===================================================================
--- pkg/src/NCLInterface.cpp	2010-03-11 22:34:21 UTC (rev 752)
+++ pkg/src/NCLInterface.cpp	2010-03-11 22:38:02 UTC (rev 753)
@@ -68,7 +68,7 @@
 				nchartoreturn=characters.GetNCharTotal();
 			}
 			else {
-				nchartoreturn=characters.GetNChar();
+				nchartoreturn=characters.GetNumIncludedChars();
 			}
 			for (int character=0; character<nchartoreturn; character++) { //We only pass the non-eliminated chars
 				NxsString charlabel=characters.GetCharLabel(character);
@@ -202,7 +202,7 @@
 				nchartoreturn=characters.GetNCharTotal();
 			}
 			else {
-				nchartoreturn=characters.GetNChar();
+				nchartoreturn=characters.GetNumIncludedChars();
 			}
 			for (int taxon=0;taxon<ntax;taxon++) {
 				nexuscharacters+='"';
@@ -305,7 +305,7 @@
 				nchartoreturn=characters.GetNCharTotal();
 			}
 			else {
-				nchartoreturn=characters.GetNChar();
+				nchartoreturn=characters.GetNumIncludedChars();
 			}
 			for (int taxon=0;taxon<ntax;taxon++) {
 				nexuscharacters+='"';
@@ -348,7 +348,7 @@
 				nchartoreturn=characters.GetNCharTotal();
 			}
 			else {
-				nchartoreturn=characters.GetNChar();
+				nchartoreturn=characters.GetNumIncludedChars();
 			}
 			for (int character=0; character<nchartoreturn; character++) { //We only pass the non-eliminated chars
 				NxsString charlabel=characters.GetCharLabel(character);
@@ -880,7 +880,7 @@
 				nchartoreturn=characters->GetNCharTotal();
 			}
 			else {
-				nchartoreturn=characters->GetNChar();
+				nchartoreturn=characters->GetNumIncludedChars();
 			}
 			for (int character=0; character<nchartoreturn; character++) { //We only pass the non-eliminated chars
 				NxsString charlabel=characters->GetCharLabel(character);
@@ -993,7 +993,7 @@
 				nchartoreturn=characters->GetNCharTotal();
 			}
 			else {
-				nchartoreturn=characters->GetNChar();
+				nchartoreturn=characters->GetNumIncludedChars();
 			}
 			for (int taxon=0;taxon<ntax;taxon++) {
 				nexuscharacters+='"';
@@ -1096,7 +1096,7 @@
 				nchartoreturn=characters->GetNCharTotal();
 			}
 			else {
-				nchartoreturn=characters->GetNChar();
+				nchartoreturn=characters->GetNumIncludedChars();
 			}
 			for (int taxon=0;taxon<ntax;taxon++) {
 				nexuscharacters+='"';
@@ -1139,7 +1139,7 @@
 				nchartoreturn=characters->GetNCharTotal();
 			}
 			else {
-				nchartoreturn=characters->GetNChar();
+				nchartoreturn=characters->GetNumIncludedChars();
 			}
 			for (int character=0; character<nchartoreturn; character++) { //We only pass the non-eliminated chars
 				NxsString charlabel=characters->GetCharLabel(character);
@@ -1286,7 +1286,7 @@
 			nchartoreturn=characters->GetNCharTotal();
 		}
 		else {
-			nchartoreturn=characters->GetNChar();
+			nchartoreturn=characters->GetNumIncludedChars();
 		}
 		for (int character=0; character<nchartoreturn; character++) { //We only pass the non-eliminated chars
 			NxsString charlabel=characters->GetCharLabel(character);