changed int to pid_t type in fork(). roughed in get.mimarkscommand.

[mothur.git] / treegroupscommand.h

diff --git a/treegroupscommand.h b/treegroupscommand.h
index 979612f4aea3aa41187ea520483afadfa05b1782..3c26eb1088a4a7b53eb1458f166ea6aa282e9fe8 100644 (file)
--- a/treegroupscommand.h
+++ b/treegroupscommand.h
@@ -60,6 +60,8 @@
 #include "memchord.h"
 #include "memeuclidean.h"
 #include "mempearson.h"
+#include "sharedrjsd.h"
+#include "sharedjsd.h"
 
 
 
@@ -139,6 +141,7 @@ struct treeSharedData {
        unsigned long long start;
        unsigned long long end;
        MothurOut* m;
+    int count;
        
        treeSharedData(){}
        treeSharedData(MothurOut* mout, unsigned long long st, unsigned long long en, vector<string> est, vector<SharedRAbundVector*> lu) {
@@ -147,6 +150,7 @@ struct treeSharedData {
                end = en;
         Estimators = est;
         thisLookup = lu;
+        count=0;
        }
 };
 /**************************************************************************************************/
@@ -249,6 +253,8 @@ static DWORD WINAPI MyTreeSharedThreadFunction(LPVOID lpParam){
                vector<SharedRAbundVector*> subset;
                for (int k = pDataArray->start; k < pDataArray->end; k++) { // pass cdd each set of groups to compare
                        
+            pDataArray->count++;
+            
                        for (int l = 0; l < k; l++) {
                                
                                if (k != l) { //we dont need to similiarity of a groups to itself