working on parallelizing unifrac.unweighted.

[mothur.git] / distancecommand.h

diff --git a/distancecommand.h b/distancecommand.h
index f825cfbf343455b9ba5ef4bfb89836df8775cebe..4a257612a85c7d1b23ebf37fcc2a8435b996ab60 100644 (file)
--- 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<int, int> processIDS;   //end line, processid
        vector<linePair*> lines;
@@ -43,7 +43,7 @@ private:
        bool abort;
        vector<string>  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);
        
@@ -53,6 +53,7 @@ private:
        #endif
        
        int convertMatrix(string);
+       bool sanityCheck();
        int convertToLowerTriangle(string);
 
 };