X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=summarysharedcommand.cpp;h=59c12a03dae958f4bb199a6aad94056264c0426a;hp=2c9399bda1dd363d04c1fed89ff9b12ea8c3aace;hb=b206f634aae1b4ce13978d203247fb64757d5482;hpb=ac03f1f6c27b5bfdf2cfb6d45c3667c3e0281f51

diff --git a/summarysharedcommand.cpp b/summarysharedcommand.cpp
index 2c9399b..59c12a0 100644
--- a/summarysharedcommand.cpp
+++ b/summarysharedcommand.cpp
@@ -17,7 +17,7 @@ vector<string> SummarySharedCommand::setParameters(){
 		CommandParameter plabel("label", "String", "", "", "", "", "","",false,false); parameters.push_back(plabel);
         CommandParameter psubsample("subsample", "String", "", "", "", "", "","phylip",false,false); parameters.push_back(psubsample);
 		CommandParameter pdistance("distance", "Boolean", "", "F", "", "", "","phylip",false,false); parameters.push_back(pdistance);
-		CommandParameter pcalc("calc", "Multiple", "sharedchao-sharedsobs-sharedace-jabund-sorabund-jclass-sorclass-jest-sorest-thetayc-thetan-kstest-whittaker-sharednseqs-ochiai-anderberg-kulczynski-kulczynskicody-lennon-morisitahorn-braycurtis-odum-canberra-structeuclidean-structchord-hellinger-manhattan-structpearson-soergel-spearman-structkulczynski-speciesprofile-structchi2-hamming-gower-memchi2-memchord-memeuclidean-mempearson", "sharedsobs-sharedchao-sharedace-jabund-sorabund-jclass-sorclass-jest-sorest-thetayc-thetan", "", "", "","",true,false,true); parameters.push_back(pcalc);
+		CommandParameter pcalc("calc", "Multiple", "sharedchao-sharedsobs-sharedace-jabund-sorabund-jclass-sorclass-jest-sorest-thetayc-thetan-kstest-whittaker-sharednseqs-ochiai-anderberg-kulczynski-kulczynskicody-lennon-morisitahorn-braycurtis-odum-canberra-structeuclidean-structchord-hellinger-manhattan-structpearson-soergel-spearman-structkulczynski-speciesprofile-structchi2-hamming-gower-memchi2-memchord-memeuclidean-mempearson-jsd-rjsd", "sharedsobs-sharedchao-sharedace-jabund-sorabund-jclass-sorclass-jest-sorest-thetayc-thetan", "", "", "","",true,false,true); parameters.push_back(pcalc);
         CommandParameter poutput("output", "Multiple", "lt-square", "lt", "", "", "","",false,false); parameters.push_back(poutput);
 		CommandParameter pall("all", "Boolean", "", "F", "", "", "","",false,false); parameters.push_back(pall);
         CommandParameter piters("iters", "Number", "", "1000", "", "", "","",false,false); parameters.push_back(piters);
@@ -294,6 +294,10 @@ SummarySharedCommand::SummarySharedCommand(string option)  {
 							sumCalculators.push_back(new MemEuclidean());
 						}else if (Estimators[i] == "mempearson") { 
 							sumCalculators.push_back(new MemPearson());
+						}else if (Estimators[i] == "jsd") {
+							sumCalculators.push_back(new JSD());
+						}else if (Estimators[i] == "rjsd") {
+							sumCalculators.push_back(new RJSD());
 						}
 					}
 				}