X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=distancecommand.h;h=64eac8d57affc1090bbc324bb76ccb6f7fa5648d;hb=a98eb683e17d8e49583bf2d215ab7562a4cdca75;hp=36a1e24b0986bb24a106fb3b72f6cba17f1acfce;hpb=83b5acbe3d6087a6cd73e80dde4b923387a01d01;p=mothur.git diff --git a/distancecommand.h b/distancecommand.h index 36a1e24..64eac8d 100644 --- a/distancecommand.h +++ b/distancecommand.h @@ -43,18 +43,20 @@ private: bool abort; vector Estimators; //holds estimators to be used - //void appendFiles(string, string); + //void m->appendFiles(string, string); void createProcesses(string); int driver(/*Dist*, SequenceDB, */int, int, string, float); + int driver(int, int, string, string); #ifdef USE_MPI int driverMPI(int, int, MPI_File&, float); - int driverMPI(int, int, string, long&); + int driverMPI(int, int, string, unsigned long int&); + int driverMPI(int, int, string, unsigned long int&, string); #endif - int convertMatrix(string); + //int convertMatrix(string); bool sanityCheck(); - int convertToLowerTriangle(string); + //int convertToLowerTriangle(string); };