This is v.1.4.0

[mothur.git] / sharedordervector.cpp

diff --git a/sharedordervector.cpp b/sharedordervector.cpp
index 973f69553a476c4e67f72c4b9f10cecae0bc32b6..218ed8709dd6ce4b624c233c4d60aa8c3cb4a27f 100644 (file)
--- a/sharedordervector.cpp
+++ b/sharedordervector.cpp
@@ -7,9 +7,6 @@
  *
  */
 
-using namespace std;
-
-
 #include "sharedordervector.h"
 #include "sharedutilities.h"
 
@@ -36,7 +33,7 @@ SharedOrderVector::SharedOrderVector(ifstream& f) : DataVector() {  //reads in a
                
                if (globaldata->gGroupmap == NULL) {  groupmap = new GroupMap(); }
                
-               int num, inputData, pos, count;
+               int num, inputData, count;
                count = 0;  numSeqs = 0;
                string holdLabel, nextLabel, groupN;
                individual newguy;
@@ -60,9 +57,6 @@ SharedOrderVector::SharedOrderVector(ifstream& f) : DataVector() {  //reads in a
                        }
                }
                
-               //save position in file in case next line is a new label.
-               pos = f.tellg();
-               
                if (f.eof() != true) { f >> nextLabel; }
                
                //read the rest of the groups info in
@@ -85,15 +79,13 @@ SharedOrderVector::SharedOrderVector(ifstream& f) : DataVector() {  //reads in a
                                }
                        }
                        
-                       //save position in file in case next line is a new label.
-                       pos = f.tellg();
-       
+                               
                        if (f.eof() != true) { f >> nextLabel; }
 
                }
                
                //put file pointer back since you are now at a new distance label
-               f.seekg(pos, ios::beg);
+               for (int i = 0; i < nextLabel.length(); i++) { f.unget();  }
        
                if (globaldata->gGroupmap == NULL) { globaldata->gGroupmap = groupmap; }
                
@@ -149,7 +141,7 @@ individual SharedOrderVector::get(int index){
 
 
 /***********************************************************************/
-
+//commented updateStats out to improve speed, but whoever calls this must remember to update when they are done with all the pushbacks they are doing 
 void SharedOrderVector::push_back(int binNumber, int abund, string groupName){
        individual newGuy;
        newGuy.group = groupName;
@@ -159,7 +151,8 @@ void SharedOrderVector::push_back(int binNumber, int abund, string groupName){
        //numSeqs++;
        //numBins++;
        //if (abund > maxRank) { maxRank = abund; }
-       updateStats();
+       
+       //updateStats();
 }
 
 /***********************************************************************/
@@ -354,25 +347,18 @@ void SharedOrderVector::updateStats(){
                numBins = 0;
                maxRank = 0;
        
-               for(int i=0;i<data.size();i++){
-
-                       if(data[i].bin != -1){
-                               numSeqs++;
-                       }
-               }
-               //vector<individual> hold(numSeqs, 0);
-       
-               //for(int i=0;i<numSeqs;i++){
-                       //if(data[i].bin != -1){
-                               //hold[data[i].bin].bin = hold[data[i].bin].bin+1;
-                       //}
-               //}     
-
+               numSeqs = data.size();
+                               
+               vector<int> hold(numSeqs, 0);
                for(int i=0;i<numSeqs;i++){
-                       if(data[i].bin > numBins) { numBins = data[i].bin;      } 
-                       if(data[i].abundance > maxRank) {       maxRank = data[i].abundance;    }
+                       hold[data[i].bin] = hold[data[i].bin]+1;
+               }       
+               
+               for(int i=0;i<numSeqs;i++){
+                       if(hold[i] > 0)                         {       numBins++;                              }
+                       if(hold[i] > maxRank)           {       maxRank = hold[i];              }
                }
-               numBins++; //if you have 10 bins largest .bin is 9 since we start at 0.
+               
        }
        catch(exception& e) {
                cout << "Standard Error: " << e.what() << " has occurred in the SharedOrderVector class Function updateStats. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";