X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=globaldata.cpp;h=714b5ad2e447a579872f9f5b8d8c7886303a8391;hb=51cf89e90eef8b300c2786eb1560dd89e6e83445;hp=64a7c93ac0a7c5067cf102250d3efd9cf8ab7380;hpb=69180c6a4fd3c9ad48974b402d398efe61a58fa7;p=mothur.git

diff --git a/globaldata.cpp b/globaldata.cpp
index 64a7c93..714b5ad 100644
--- a/globaldata.cpp
+++ b/globaldata.cpp
@@ -1,9 +1,6 @@
 #include "globaldata.hpp"
-#include "sparsematrix.hpp"
 #include "tree.h"
-#include "rabundvector.hpp"
-#include "sabundvector.hpp"
-#include "listvector.hpp"
+#include "sparsematrix.hpp"
 
 /*******************************************************/
 
@@ -30,6 +27,7 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
 			clear();
 			gGroupmap = NULL;
 			gTree.clear();
+			Treenames.clear();
 			labels.clear(); lines.clear(); groups.clear();
 			allLines = 1;
 		}
@@ -75,6 +73,7 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
 				if (key == "step")			{ step = value;			}
 				if (key == "form")			{ form = value;			}
 				if (key == "sorted")		{ sorted = value;		}
+				if (key == "scale")			{ scale = value;		}
 				
 
 				
@@ -130,6 +129,8 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
 			if (key == "step")			{ step = value;			}
 			if (key == "form")			{ form = value;			}
 			if (key == "sorted")		{ sorted = value;		}
+			if (key == "scale")			{ scale = value;		}
+			
 
 			if (key == "line") {//stores lines to be used in a vector
 				lines.clear();
@@ -139,6 +140,7 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
 				if (line != "all") {  splitAtDash(value, lines);  allLines = 0;  }
 				else { allLines = 1;  }
 			}
+			
 			if (key == "label") {//stores lines to be used in a vector
 				labels.clear();
 				lines.clear();
@@ -161,7 +163,7 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
 				
 		//input defaults for calculators
 		if (commandName == "collect.single") {
-			if ((calc == "default") || (calc == "")) { calc = "sobs-chao-ace-jack-bootstrap-shannon-npshannon-simpson-geom-qstat-logsd-bergerparker-bstick"; }
+			if ((calc == "default") || (calc == "")) { calc = "sobs-chao-ace-jack-shannon-npshannon-simpson"; }
 			Estimators.clear();
 			splitAtDash(calc, Estimators); 
 		}
@@ -171,17 +173,17 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
 			splitAtDash(calc, Estimators); 
 		}
 		if (commandName == "collect.shared") {
-			if ((calc == "default") || (calc == "")) { calc = "sharedsobs-sharedchao-sharedace-sharedjabund-sharedsorensonabund-sharedjclass-sharedsorclass-sharedjest-sharedsorest-sharedthetayc-sharedthetan-sharedkstest-sharedbdiversity"; }
+			if ((calc == "default") || (calc == "")) { calc = "sharedsobs-sharedchao-sharedace-jabund-sorensonabund-jclass-sorclass-jest-sorest-thetayc-thetan"; }
 			Estimators.clear();
 			splitAtDash(calc, Estimators); 
 		}
 		if (commandName == "summary.single") {
-			if ((calc == "default") || (calc == "")) { calc = "sobs-chao-ace-jack-bootstrap-shannon-npshannon-simpson-geom-logsd-qstat-bergerparker-bstick"; }
+			if ((calc == "default") || (calc == "")) { calc = "sobs-chao-ace-jack-shannon-npshannon-simpson"; }
 			Estimators.clear();
 			splitAtDash(calc, Estimators); 
 		}
 		if (commandName == "summary.shared") {
-			if ((calc == "default") || (calc == "")) { calc = "sharedsobs-sharedchao-sharedace-sharedjabund-sharedsorensonabund-sharedjclass-sharedsorclass-sharedjest-sharedsorest-sharedthetayc-sharedthetan-sharedkstest-sharedbdiversity"; }
+			if ((calc == "default") || (calc == "")) { calc = "sharedsobs-sharedchao-sharedace-jabund-sorensonabund-jclass-sorclass-jest-sorest-thetayc-thetan"; }
 			Estimators.clear();
 			splitAtDash(calc, Estimators); 
 		}
@@ -190,6 +192,21 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
 			Estimators.clear();
 			splitAtDash(calc, Estimators); 
 		}
+		if (commandName == "venn") {
+			if ((calc == "default") || (calc == "")) { 
+				if (format == "list") { calc = "sobs"; }
+				else { calc = "sharedsobs"; }
+			}
+			Estimators.clear();
+			splitAtDash(calc, Estimators); 
+		}
+		if ((commandName == "tree.shared") || (commandName == "bootstrap.shared")) {
+			if (calc != "") { 
+				Estimators.clear();
+				splitAtDash(calc, Estimators);			
+			}else { cout << "You have not specified any calculators." << endl; }
+		}
+
 
 		//if you have done a read.otu with a groupfile but don't want to use it anymore because you want to do single commands
 		if ((commandName == "collect.single") || (commandName == "rarefaction.single") || (commandName == "summary.single")) {
@@ -236,6 +253,7 @@ string GlobalData::getGroups()			{	return groups;		}
 string GlobalData::getStep()			{	return step;		}
 string GlobalData::getForm()			{	return form;		}
 string GlobalData::getSorted()			{	return sorted;		}
+string GlobalData::getScale()			{	return scale;		}
 void GlobalData::setListFile(string file)	{	listfile = file;	inputFileName = file;}
 void GlobalData::setRabundFile(string file)	{	rabundfile = file;	inputFileName = file;}
 void GlobalData::setSabundFile(string file)	{	sabundfile = file;	inputFileName = file;}
@@ -286,7 +304,8 @@ void GlobalData::clear() {
 	abund           =   "10";
 	step			=	"0.01";
 	form			=	"integral";
-	sorted			=	"1";  //0 means don't sort, 1 means sort.
+	sorted			=	"T";  //F means don't sort, T means sort.
+	scale			=	"log10";
 }
 
 //*******************************************************/
@@ -298,7 +317,7 @@ void GlobalData::reset() {
 	iters			=	"1000"; 
 	groups			=	"";
 	jumble			=	"1";	//0 means don't jumble, 1 means jumble.
-	sorted			=	"1";  //0 means don't sort, 1 means sort.
+	sorted			=	"T";  //F means don't sort, T means sort.
 	randomtree		=	"";  //"" means user will enter some user trees, "outputfile" means they just want the random tree distribution to be outputted to outputfile.
 	freq			=	"100";
 	method			=	"furthest";
@@ -317,3 +336,144 @@ GlobalData::~GlobalData() {
 	if(gorder != NULL)			{	delete gorder;		}
 }
 /*******************************************************/
+
+/*******************************************************/
+void GlobalData::parseTreeFile() {
+	//only takes names from the first tree and assumes that all trees use the same names.
+	try {
+		string filename = treefile;
+		ifstream filehandle;
+		openInputFile(filename, filehandle);
+		int c, comment;
+		comment = 0;
+		
+		//if you are not a nexus file 
+		if ((c = filehandle.peek()) != '#') {  
+			while((c = filehandle.peek()) != ';') { 
+				while ((c = filehandle.peek()) != ';') {
+					// get past comments
+					if(c == '[') {
+						comment = 1;
+					}
+					if(c == ']'){
+						comment = 0;
+					}
+					if((c == '(') && (comment != 1)){ break; }
+					filehandle.get();
+				}
+
+				readTreeString(filehandle); 
+			}
+		//if you are a nexus file
+		}else if ((c = filehandle.peek()) == '#') {
+			string holder = "";
+					
+			// get past comments
+			while(holder != "translate" && holder != "Translate"){	
+				if(holder == "[" || holder == "[!"){
+					comment = 1;
+				}
+				if(holder == "]"){
+					comment = 0;
+				}
+				filehandle >> holder; 
+	
+				//if there is no translate then you must read tree string otherwise use translate to get names
+				if(holder == "tree" && comment != 1){	
+					//pass over the "tree rep.6878900 = "
+					while (((c = filehandle.get()) != '(') && ((c = filehandle.peek()) != EOF) ) {;}
+
+					if (c == EOF ) { break; }
+					filehandle.putback(c);  //put back first ( of tree.
+					readTreeString(filehandle);	
+					break;
+				}
+			}
+			
+			//use nexus translation rather than parsing tree to save time
+			if ((holder == "translate") || (holder == "Translate")) {
+
+				string number, name, h;
+				h = ""; // so it enters the loop the first time
+				while((h != ";") && (number != ";")) { 
+					filehandle >> number;
+					filehandle >> name;
+	
+					//c = , until done with translation then c = ;
+					h = name.substr(name.length()-1, name.length()); 
+					name.erase(name.end()-1);  //erase the comma
+					Treenames.push_back(number);
+				}
+				if (number == ";") { Treenames.pop_back(); }  //in case ';' from translation is on next line instead of next to last name
+			}
+		}
+		
+	}
+	catch(exception& e) {
+		cout << "Standard Error: " << e.what() << " has occurred in the GlobalData class Function parseTreeFile. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+		exit(1);
+	}
+	catch(...) {
+		cout << "An unknown error has occurred in the GlobalData class function parseTreeFile. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+		exit(1);
+	}		
+}
+/*******************************************************/
+
+/*******************************************************/
+void GlobalData::readTreeString(ifstream& filehandle)	{
+	try {
+		int c;
+		string name; //k
+		
+		while((c = filehandle.peek()) != ';') { 
+				//if you are a name
+			if ((c != '(') && (c != ')') && (c != ',') && (c != ':') && (c != '\n') && (c != '\t') && (c != 32)) { //32 is space
+				name = "";
+				c = filehandle.get();
+	//		k = c;
+//cout << k << endl;
+				while ((c != '(') && (c != ')') && (c != ',') && (c != ':') && (c != '\n') && (c != 32) && (c != '\t')) {			
+					name += c;
+					c = filehandle.get();
+		//	k = c;
+//cout << " in name while " << k << endl;
+				}
+				
+//cout << "name = " << name << endl;
+				Treenames.push_back(name);
+				filehandle.putback(c);
+//k = c;
+//cout << " after putback" <<  k << endl;
+			} 
+			
+			if (c  == ':') { //read until you reach the end of the branch length
+				while ((c != '(') && (c != ')') && (c != ',') && (c != ';') && (c != '\n') && (c != '\t') && (c != 32)) {
+					c = filehandle.get();
+				//	k = c;
+	//cout << " in branch while " << k << endl;
+				}
+				filehandle.putback(c);
+			}
+			c = filehandle.get();
+			if (c == ';') { break; }
+		//	k = c;
+//cout << k << endl;
+
+		}
+	}
+	catch(exception& e) {
+		cout << "Standard Error: " << e.what() << " has occurred in the GlobalData class Function parseTreeFile. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+		exit(1);
+	}
+	catch(...) {
+		cout << "An unknown error has occurred in the GlobalData class function parseTreeFile. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+		exit(1);
+	}		
+}	
+
+/*******************************************************/
+
+/*******************************************************/
+
+