X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=splitmatrix.cpp;h=1f23ec3aa48202d6516208d643c09b6928da6f47;hb=cdf9083dc32543cc640e72e9ca3aee0323cbad45;hp=ec71e5bfd0090b1172d50403a6b54903a030c3f4;hpb=cbb336d5650cfe1f83a398a837794dcfbbbd3756;p=mothur.git diff --git a/splitmatrix.cpp b/splitmatrix.cpp index ec71e5b..1f23ec3 100644 --- a/splitmatrix.cpp +++ b/splitmatrix.cpp @@ -10,6 +10,7 @@ #include "splitmatrix.h" #include "phylotree.h" #include "distancecommand.h" +#include "seqsummarycommand.h" /***********************************************************************/ @@ -182,9 +183,10 @@ int SplitMatrix::createDistanceFilesFromTax(map& seqGroup, int numG //process each distance file for (int i = 0; i < numGroups; i++) { - string options = "fasta=" + (fastafile + "." + toString(i) + ".temp") + ", processors=" + toString(1) + ", cutoff=" + toString(distCutoff); + string options = "fasta=" + (fastafile + "." + toString(i) + ".temp") + ", processors=" + toString(processors) + ", cutoff=" + toString(distCutoff); Command* command = new DistanceCommand(options); + command->execute(); delete command; @@ -193,7 +195,7 @@ int SplitMatrix::createDistanceFilesFromTax(map& seqGroup, int numG //remove old names files just in case remove((namefile + "." + toString(i) + ".temp").c_str()); } - + singleton = namefile + ".extra.temp"; ofstream remainingNames; m->openOutputFile(singleton, remainingNames);