[Phylobase-commits] r751 - pkg/src

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

Author: francois
Date: 2010-03-11 23:30:57 +0100 (Thu, 11 Mar 2010)
New Revision: 751

Modified:
   pkg/src/ReadWithNCL.cpp
Log:
changes to ReadWithNCL.cpp to allow option return.labels

Modified: pkg/src/ReadWithNCL.cpp
===================================================================
--- pkg/src/ReadWithNCL.cpp	2010-03-11 22:30:10 UTC (rev 750)
+++ pkg/src/ReadWithNCL.cpp	2010-03-11 22:30:57 UTC (rev 751)
@@ -79,7 +79,7 @@
 		//string discreteString = "This was passed in the discrete string";
 
 		NxsString characterStringNxs;
-		reader.RReturnCharacters(characterStringNxs,false, true, false);
+		reader.RReturnCharacters(characterStringNxs,false, true, false, false);
 		//string characterString=characterStringNxs.c_str();
 
 		string continuousString = "This was passed in the continuous string";
@@ -194,6 +194,7 @@
 		bool allchar = rparam.getBoolValue("allchar");
 		bool levelsall=rparam.getBoolValue("levelsall");
 		bool polymorphictomissing=rparam.getBoolValue("polymorphictomissing");
+		bool returnlabels=rparam.getBoolValue("returnlabels");
 
 		BASICCMDLINE reader;
 
@@ -203,7 +204,7 @@
 		reader.Initialize(const_cast < char* > (filename.c_str()));
 
 		NxsString charStringNxs;
-		reader.RReturnCharacters(charStringNxs,allchar, polymorphictomissing, levelsall);
+		reader.RReturnCharacters(charStringNxs,allchar, polymorphictomissing, levelsall, returnlabels);
 		string charString=charStringNxs.c_str();
 
 		// Build result set to be returned as a list to R.