X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=phylodiversitycommand.cpp;fp=phylodiversitycommand.cpp;h=ddd2b316d507b8477d84d529ae9fc4d88c69e518;hb=0cefb55a2616975bd4a144fc345693695ffc9bb6;hp=9d68cb5debbbc65472577c4861391bb8ffbde3bc;hpb=44f3a3c81a34fdee62550d98838a4b421e8df08e;p=mothur.git diff --git a/phylodiversitycommand.cpp b/phylodiversitycommand.cpp index 9d68cb5..ddd2b31 100644 --- a/phylodiversitycommand.cpp +++ b/phylodiversitycommand.cpp @@ -346,7 +346,7 @@ int PhyloDiversityCommand::execute(){ if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) { m->mothurRemove(outputNames[i]); } return 0; } - m->mothurOut("It took " + toString(time(NULL) - start) + " secs to run unifrac.unweighted."); m->mothurOutEndLine(); + m->mothurOut("It took " + toString(time(NULL) - start) + " secs to run phylo.diversity."); m->mothurOutEndLine(); m->mothurOutEndLine(); @@ -460,7 +460,7 @@ int PhyloDiversityCommand::driver(Tree* t, map< string, vector >& div, ma for (int l = 0; l < numIters; l++) { random_shuffle(randomLeaf.begin(), randomLeaf.end()); - cout << l << endl; + //initialize counts map counts; vector< map > countedBranch;