X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=matrixoutputcommand.cpp;h=2e6943f0eb7aed1c0b881b5dd5a5d079cdd4fb87;hb=6ce64c0c32f0aa22eaf70953bd8264130e20e18f;hp=a53a3dcb92837f112771f44ef39219d9e36a277a;hpb=c48d91112209b841444923670dca5454da0e2a4d;p=mothur.git

diff --git a/matrixoutputcommand.cpp b/matrixoutputcommand.cpp
index a53a3dc..2e6943f 100644
--- a/matrixoutputcommand.cpp
+++ b/matrixoutputcommand.cpp
@@ -17,7 +17,7 @@ vector<string> MatrixOutputCommand::setParameters(){
 		CommandParameter plabel("label", "String", "", "", "", "", "","",false,false); parameters.push_back(plabel);
         CommandParameter psubsample("subsample", "String", "", "", "", "", "","",false,false); parameters.push_back(psubsample);
 		CommandParameter pgroups("groups", "String", "", "", "", "", "","",false,false); parameters.push_back(pgroups);
-		CommandParameter pcalc("calc", "Multiple", "sharedsobs-sharedchao-sharedace-jabund-sorabund-jclass-sorclass-jest-sorest-thetayc-thetan-kstest-sharednseqs-ochiai-anderberg-kulczynski-kulczynskicody-lennon-morisitahorn-braycurtis-whittaker-odum-canberra-structeuclidean-structchord-hellinger-manhattan-structpearson-soergel-spearman-structkulczynski-speciesprofile-hamming-structchi2-gower-memchi2-memchord-memeuclidean-mempearson", "jclass-thetayc", "", "", "","",true,false,true); parameters.push_back(pcalc);
+		CommandParameter pcalc("calc", "Multiple", "sharedsobs-sharedchao-sharedace-jabund-sorabund-jclass-sorclass-jest-sorest-thetayc-thetan-kstest-sharednseqs-ochiai-anderberg-kulczynski-kulczynskicody-lennon-morisitahorn-braycurtis-whittaker-odum-canberra-structeuclidean-structchord-hellinger-manhattan-structpearson-soergel-spearman-structkulczynski-speciesprofile-hamming-structchi2-gower-memchi2-memchord-memeuclidean-mempearson-jsd-rjsd", "jclass-thetayc", "", "", "","",true,false,true); parameters.push_back(pcalc);
 		CommandParameter poutput("output", "Multiple", "lt-square-column", "lt", "", "", "","",false,false); parameters.push_back(poutput);
         CommandParameter pmode("mode", "Multiple", "average-median", "average", "", "", "","",false,false); parameters.push_back(pmode);
 		CommandParameter pprocessors("processors", "Number", "", "1", "", "", "","",false,false,true); parameters.push_back(pprocessors);
@@ -281,6 +281,10 @@ MatrixOutputCommand::MatrixOutputCommand(string option)  {
 							matrixCalculators.push_back(new MemEuclidean());
 						}else if (Estimators[i] == "mempearson") { 
 							matrixCalculators.push_back(new MemPearson());
+                        }else if (Estimators[i] == "jsd") {
+                                matrixCalculators.push_back(new JSD());
+                        }else if (Estimators[i] == "rjsd") {
+                            matrixCalculators.push_back(new RJSD());
 						}
 					}
 				}
@@ -791,7 +795,7 @@ int MatrixOutputCommand::driver(vector<SharedRAbundVector*> thisLookup, int star
 						vector<double> tempdata = matrixCalculators[i]->getValues(subset); //saves the calculator outputs
 						
 						if (m->control_pressed) { return 1; }
-						
+        
 						seqDist temp(l, k, tempdata[0]);
 						calcDists[i].push_back(temp);
 					}