X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=corraxescommand.cpp;h=db2e9891738cdf57b78dffe1a9c232f18e5de31c;hb=fa08e82ec2dd48f73d051c210dad54a403308949;hp=0d421b5aba7d6be8e8f9bf13ae00d39eecbac926;hpb=37eac2026d91179acda0494c4dcca22f176551b9;p=mothur.git

diff --git a/corraxescommand.cpp b/corraxescommand.cpp
index 0d421b5..db2e989 100644
--- a/corraxescommand.cpp
+++ b/corraxescommand.cpp
@@ -190,7 +190,7 @@ CorrAxesCommand::CorrAxesCommand(string option)  {
 
 void CorrAxesCommand::help(){
 	try {
-		m->mothurOut("The corr.axes command reads a shared or relabund file as well as a pcoa file and calculates the correlation coefficient.\n");
+		m->mothurOut("The corr.axes command reads a shared, relabund or metadata file as well as an axes file and calculates the correlation coefficient.\n");
 		m->mothurOut("The corr.axes command parameters are shared, relabund, axes, metadata, groups, method, numaxes and label.  The shared, relabund or metadata and axes parameters are required.  If shared is given the relative abundance is calculated.\n");
 		m->mothurOut("The groups parameter allows you to specify which of the groups you would like included. The group names are separated by dashes.\n");
 		m->mothurOut("The label parameter allows you to select what distance level you would like used, if none is given the first distance is used.\n");
@@ -283,11 +283,11 @@ int CorrAxesCommand::execute(){
 		out.setf(ios::fixed, ios::floatfield); out.setf(ios::showpoint);
 		
 		//output headings
-		if (metadatafile == "") {  out << "OTU\t";	}
-		else {  out << "Feature\t";						}
+		if (metadatafile == "") {  out << "OTU";	}
+		else {  out << "Feature";						}
 
-		for (int i = 0; i < numaxes; i++) { out << "axis" << (i+1) << '\t'; }
-		out << endl;
+		for (int i = 0; i < numaxes; i++) { out << '\t' << "axis" << (i+1); }
+		out << "\tlength" << endl;
 		
 		if (method == "pearson")		{  calcPearson(axes, out);	}
 		else if (method == "spearman")	{  calcSpearman(axes, out); }
@@ -329,9 +329,9 @@ int CorrAxesCommand::calcPearson(map<string, vector<float> >& axes, ofstream& ou
 	   //for each otu
 	   for (int i = 0; i < lookupFloat[0]->getNumBins(); i++) {
 		   
-		   if (metadatafile == "") {  out << i+1 << '\t';	}
-		   else {  out << metadataLabels[i] << '\t';		}
-		   
+		   if (metadatafile == "") {  out << i+1;	}
+		   else {  out << metadataLabels[i];		}
+		   		   
 		   //find the averages this otu - Y
 		   float sumOtu = 0.0;
 		   for (int j = 0; j < lookupFloat.size(); j++) {
@@ -339,6 +339,8 @@ int CorrAxesCommand::calcPearson(map<string, vector<float> >& axes, ofstream& ou
 		   }
 		   float Ybar = sumOtu / (float) lookupFloat.size();
 		   
+		   vector<float> rValues(averageAxes.size());
+
 		   //find r value for each axis
 		   for (int k = 0; k < averageAxes.size(); k++) {
 			   
@@ -358,11 +360,15 @@ int CorrAxesCommand::calcPearson(map<string, vector<float> >& axes, ofstream& ou
 			   double denom = (sqrt(denomTerm1) * sqrt(denomTerm2));
 			   
 			   r = numerator / denom;
-			   
-			   out << r << '\t'; 
+			   rValues[k] = r;
+			   out << '\t' << r; 
 		   }
 		   
-		   out << endl;
+		   double sum = 0;
+		   for(int k=0;k<rValues.size();k++){
+			   sum += rValues[k] * rValues[k];
+		   }
+		   out << '\t' << sqrt(sum) << endl;
 	   }
 	   	   
 	   return 0;
@@ -422,8 +428,8 @@ int CorrAxesCommand::calcSpearman(map<string, vector<float> >& axes, ofstream& o
 		//for each otu
 		for (int i = 0; i < lookupFloat[0]->getNumBins(); i++) {
 			
-			if (metadatafile == "") {  out << i+1 << '\t';	}
-			else {  out << metadataLabels[i] << '\t';		}
+			if (metadatafile == "") {  out << i+1;	}
+			else {  out << metadataLabels[i];		}
 			
 			//find the ranks of this otu - Y
 			vector<spearmanRank> otuScores;
@@ -458,6 +464,7 @@ int CorrAxesCommand::calcSpearman(map<string, vector<float> >& axes, ofstream& o
 				}
 			}
 			
+			vector<double> pValues(numaxes);
 			//calc spearman ranks for each axis for this otu
 			for (int j = 0; j < numaxes; j++) {
 				
@@ -473,11 +480,16 @@ int CorrAxesCommand::calcSpearman(map<string, vector<float> >& axes, ofstream& o
 				int n = lookupFloat.size();
 				double p = 1.0 - ((6 * di) / (float) (n * ((n*n) - 1)));
 				
-				out << p << '\t';
+				out  << '\t' << p;
+				pValues[j] = p;
+
 			}
-			
-			
-			out << endl;
+
+			double sum = 0;
+			for(int k=0;k<numaxes;k++){
+				sum += pValues[k] * pValues[k];
+			}
+			out << '\t' << sqrt(sum) << endl;
 		}
 		
 		return 0;
@@ -534,8 +546,8 @@ int CorrAxesCommand::calcKendall(map<string, vector<float> >& axes, ofstream& ou
 		//for each otu
 		for (int i = 0; i < lookupFloat[0]->getNumBins(); i++) {
 		
-			if (metadatafile == "") {  out << i+1 << '\t';	}
-			else {  out << metadataLabels[i] << '\t';		}
+			if (metadatafile == "") {  out << i+1;	}
+			else {  out << metadataLabels[i];		}
 			
 			//find the ranks of this otu - Y
 			vector<spearmanRank> otuScores;
@@ -569,6 +581,7 @@ int CorrAxesCommand::calcKendall(map<string, vector<float> >& axes, ofstream& ou
 					}
 				}
 			}
+			vector<double> pValues(numaxes);
 			
 			//calc spearman ranks for each axis for this otu
 			for (int j = 0; j < numaxes; j++) {
@@ -597,10 +610,16 @@ int CorrAxesCommand::calcKendall(map<string, vector<float> >& axes, ofstream& ou
 				
 				double p = ( (4 * P) / (float) (n * (n - 1)) ) - 1.0;
 				
-				out << p << '\t';
+				out << '\t' << p;
+				pValues[j] = p;
+
 			}
 			
-			out << endl;
+			double sum = 0;
+			for(int k=0;k<numaxes;k++){
+				sum += pValues[k] * pValues[k];
+			}
+			out << '\t' << sqrt(sum) << endl;
 		}
 		
 		return 0;