fixed classify.seqs output file name - had issue if reference taxonomy file did not...

[mothur.git] / matrixoutputcommand.h

diff --git a/matrixoutputcommand.h b/matrixoutputcommand.h
index 748d8c23e426d69a295a6487454404c5a0598177..8af539ba01ae59ed07027d63f2bd9d1859b4c217 100644 (file)
--- a/matrixoutputcommand.h
+++ b/matrixoutputcommand.h
@@ -88,7 +88,7 @@ private:
        };
        vector<linePair> lines;
        
-       void printSims(ostream&, vector< vector<float> >&);
+       void printSims(ostream&, vector< vector<double> >&);
        int process(vector<SharedRAbundVector*>);
        
        vector<Calculator*> matrixCalculators;
@@ -96,10 +96,10 @@ private:
        InputData* input;
        vector<SharedRAbundVector*> lookup;
        string exportFileName, output, sharedfile;
-       int numGroups, processors;
+       int numGroups, processors, iters, subsampleSize;
        ofstream out;
 
-       bool abort, allLines;
+       bool abort, allLines, subsample;
        set<string> labels; //holds labels to be used
        string outputFile, calc, groups, label, outputDir;
        vector<string>  Estimators, Groups, outputNames; //holds estimators to be used
@@ -110,7 +110,6 @@ private:
        
 /**************************************************************************************************/
 //custom data structure for threads to use.
-//main process handling the calcs that can do more than 2 groups
 // This is passed by void pointer so it can be any data type
 // that can be passed using a single void pointer (LPVOID).
 struct distSharedData {
@@ -131,7 +130,7 @@ struct distSharedData {
        }
 };
 /**************************************************************************************************/
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 #else
 static DWORD WINAPI MyDistSharedThreadFunction(LPVOID lpParam){ 
        distSharedData* pDataArray;