cluster.split split method defaults to classify if taxonomy file is given with no...

[mothur.git] / cooccurrencecommand.cpp

diff --git a/cooccurrencecommand.cpp b/cooccurrencecommand.cpp
index f9db5be5691f424f70874f0f318b968c186df7bb..75b87fae4303f161a1f75fb632e831672a80e29d 100644 (file)
--- a/cooccurrencecommand.cpp
+++ b/cooccurrencecommand.cpp
@@ -277,8 +277,8 @@ int CooccurrenceCommand::getCooccurrence(vector<SharedRAbundVector*>& thisLookUp
         vector<int> columntotal; columntotal.resize(thisLookUp.size(), 0);
         vector<int> rowtotal; rowtotal.resize(numOTUS, 0);
         
-        for (int i = 0; i < thisLookUp.size(); i++) {
-            for (int j = 0; j < thisLookUp[i]->getNumBins(); j++) {
+        for (int i = 0; i < thisLookUp.size(); i++) { //nrows in the shared file
+            for (int j = 0; j < thisLookUp[i]->getNumBins(); j++) { //cols of original shared file
                 if (m->control_pressed) { return 0; }
                 int abund = thisLookUp[i]->getAbundance(j);
                 
@@ -296,8 +296,6 @@ int CooccurrenceCommand::getCooccurrence(vector<SharedRAbundVector*>& thisLookUp
         int ncols = thisLookUp.size();//groups
         double initscore = 0.0;
         
-        vector<int> columntotal; columntotal.resize(ncols, 0);
-        vector<int> rowtotal; rowtotal.resize(nrows, 0);
         vector<double> stats;
         double probabilityMatrix[ncols * nrows];
         vector<vector<int> > nullmatrix(nrows, vector<int>(ncols, 0));
@@ -319,15 +317,16 @@ int CooccurrenceCommand::getCooccurrence(vector<SharedRAbundVector*>& thisLookUp
                 }
             }
         }
-        else if (matrix == "sim2") {
-            for(int i=0;i<nrows;i++) {
-                start = 0.0;
-                for(int j=0;j<ncols;j++) {
-                    probabilityMatrix[ncols * i + j] = start + 1/double(ncols);
-                    start = start + 1/double(ncols);
-                }
-            }
-        }
+        //don't need a prob matrix because we just shuffle the rows, may use this in the future
+        else if (matrix == "sim2") { }
+//            for(int i=0;i<nrows;i++) {
+//                start = 0.0;
+//                for(int j=0;j<ncols;j++) {
+//                    probabilityMatrix[ncols * i + j] = start + 1/double(ncols);
+//                    start = start + 1/double(ncols);
+//                }
+//            }
+//        }
         
         else if (matrix == "sim3") {
             for(int j=0;j<ncols;j++) {
@@ -386,7 +385,7 @@ int CooccurrenceCommand::getCooccurrence(vector<SharedRAbundVector*>& thisLookUp
                 }
             }
         }
-        else if (matrix == "sim9") { }
+        else if (matrix == "sim9" || matrix == "sim2") { }
         else {
             m->mothurOut("[ERROR]: No model selected! \n");
             m->control_pressed = true;
@@ -406,79 +405,14 @@ int CooccurrenceCommand::getCooccurrence(vector<SharedRAbundVector*>& thisLookUp
         double current;
         double randnum;
         int count;
-        
-        //burn-in
-        for(int i=0;i<10000;i++){
-            nullmatrix.clear();
-            //zero-fill the null matrix
-            nullmatrix.assign(nrows, vector<int>(ncols, 0));
-            
-            if(matrix == "sim1" || matrix == "sim6" || matrix == "sim8" || matrix == "sim7") {
-                count = 0;
-                while(count < n) {
-                nextnum:
-                    previous = 0.0;
-                    randnum = rand() / double(RAND_MAX);
-                    for(int i=0;i<nrows;i++) {
-                        for(int j=0;j<ncols;j++) {
-                            current = probabilityMatrix[ncols * i + j];
-                            if(randnum <= current && randnum > previous) {
-                                nullmatrix[i][j] = 1;
-                                count++;
-                                if (count > n) break;
-                                else
-                                    goto nextnum;
-                            }
-                            previous = current;
-                        }
-                    }
-                }
-            }
-            
-            else if(matrix == "sim2" || matrix == "sim4") {
-                for(int i=0;i<nrows;i++) {
-                    previous = 0.0;
-                    count = 0;
-                    while(count < rowtotal[i]) {
-                        randnum = rand() / double(RAND_MAX);
-                        for(int j=0;j<ncols;j++) {
-                            current = probabilityMatrix[ncols * i + j];
-                            if(randnum <= current && randnum > previous && nullmatrix[i][j] != 1) {
-                                nullmatrix[i][j] = 1;
-                                count++;
-                                previous = 0.0;
-                                break;
-                            }
-                            previous = current;
-                        }
-                    }
-                }
-            }
-            
-            else if(matrix == "sim3" || matrix == "sim5") {
-                //columns
-                for(int j=0;j<ncols;j++) {
-                    count = 0;
-                    while(count < columntotal[j]) {
-                        randnum = rand() / double(RAND_MAX);
-                        for(int i=0;i<nrows;i++) {
-                            current = probabilityMatrix[ncols * i + j];
-                            if(randnum <= current && randnum > previous && nullmatrix[i][j] != 1) {
-                                nullmatrix[i][j] = 1;
-                                count++;
-                                previous = 0.0;
-                                break;
-                            }
-                            previous = current;
-                        }
-                    }
-                }
-            }
-            
+
+        //burn-in for sim9    
+        if(matrix == "sim9") {
+            for(int i=0;i<10000;i++) trial.swap_checkerboards (co_matrix, ncols, nrows);
         }
-        
+
         //populate null matrix from probability matrix, do this a lot.
-        for(int i=0;i<runs;i++){
+        for(int k=0;k<runs;k++){
             nullmatrix.clear();
             //zero-fill the null matrix
             nullmatrix.assign(nrows, vector<int>(ncols, 0));
@@ -486,6 +420,7 @@ int CooccurrenceCommand::getCooccurrence(vector<SharedRAbundVector*>& thisLookUp
             if(matrix == "sim1" || matrix == "sim6" || matrix == "sim8" || matrix == "sim7") {
                 count = 0;
                 while(count < n) {
+                    if (m->control_pressed) { return 0; }
                 nextnum2:
                     previous = 0.0;
                     randnum = rand() / double(RAND_MAX);
@@ -505,11 +440,21 @@ int CooccurrenceCommand::getCooccurrence(vector<SharedRAbundVector*>& thisLookUp
                 }
             }
             
-            else if(matrix == "sim2" || matrix == "sim4") {
+            else if (matrix == "sim2") {
+                for(int i=0;i<nrows;i++) {
+                    random_shuffle( co_matrix[i].begin(), co_matrix[i].end() ); 
+                }
+                //do this for the scoring since those all have nullmatrix as a parameter
+                //nullmatrix gets cleared at the begining of each run
+                nullmatrix = co_matrix;
+            }
+            
+            else if(matrix == "sim4") {
                 for(int i=0;i<nrows;i++) {
-                    previous = 0.0;
                     count = 0;
                     while(count < rowtotal[i]) {
+                        previous = 0.0;
+                        if (m->control_pressed) { return 0; }
                         randnum = rand() / double(RAND_MAX);
                         for(int j=0;j<ncols;j++) {
                             current = probabilityMatrix[ncols * i + j];
@@ -530,6 +475,7 @@ int CooccurrenceCommand::getCooccurrence(vector<SharedRAbundVector*>& thisLookUp
                 for(int j=0;j<ncols;j++) {
                     count = 0;
                     while(count < columntotal[j]) {
+                        if (m->control_pressed) { return 0; }
                         randnum = rand() / double(RAND_MAX);
                         for(int i=0;i<nrows;i++) {
                             current = probabilityMatrix[ncols * i + j];
@@ -547,7 +493,8 @@ int CooccurrenceCommand::getCooccurrence(vector<SharedRAbundVector*>& thisLookUp
             
             //swap_checkerboards takes the original matrix and swaps checkerboards
             else if(matrix == "sim9") {
-                trial.swap_checkerboards (co_matrix, rowtotal, columntotal, ncols, nrows);
+                trial.swap_checkerboards (co_matrix, ncols, nrows);
+                nullmatrix = co_matrix;
             }
             else {
                 m->mothurOut("[ERROR]: No null model selected!\n\n"); m->control_pressed = true;