X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=distancecommand.h;h=36a1e24b0986bb24a106fb3b72f6cba17f1acfce;hb=83b5acbe3d6087a6cd73e80dde4b923387a01d01;hp=c1dac1443a4d2a213ab715d79908e6dd76027a62;hpb=aba5f8811829037b0a3004ef33f0ad4ed5e5fcf8;p=mothur.git diff --git a/distancecommand.h b/distancecommand.h index c1dac14..36a1e24 100644 --- a/distancecommand.h +++ b/distancecommand.h @@ -34,8 +34,8 @@ private: Dist* distCalculator; SequenceDB alignDB; - string countends, output, fastafile, calc, outputDir; - int processors; + string countends, output, fastafile, calc, outputDir, oldfastafile, column; + int processors, numNewFasta; float cutoff; map processIDS; //end line, processid vector lines; @@ -49,9 +49,11 @@ private: #ifdef USE_MPI int driverMPI(int, int, MPI_File&, float); + int driverMPI(int, int, string, long&); #endif int convertMatrix(string); + bool sanityCheck(); int convertToLowerTriangle(string); };