X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=sharedordervector.cpp;h=2df67b8d19b1861714aba2746e3326256cdfe2ae;hb=c27e902ede71ea4d20af65752ef04459c101611b;hp=a1eff83424b987956f9b9637b19692e883f5dce2;hpb=bfbc55964f1977da72c2cea984288a427d370a59;p=mothur.git diff --git a/sharedordervector.cpp b/sharedordervector.cpp index a1eff83..2df67b8 100644 --- a/sharedordervector.cpp +++ b/sharedordervector.cpp @@ -7,12 +7,8 @@ * */ -using namespace std; - - #include "sharedordervector.h" -#include "utilities.hpp" - +#include "sharedutilities.h" /***********************************************************************/ @@ -30,13 +26,14 @@ SharedOrderVector::SharedOrderVector(string id, vector ov) : //This function is used to read a .shared file for the collect.shared, rarefaction.shared and summary.shared commands //if you don't use a list and groupfile. -SharedOrderVector::SharedOrderVector(ifstream& f) : DataVector() { +SharedOrderVector::SharedOrderVector(ifstream& f) : DataVector() { //reads in a shared file try { globaldata = GlobalData::getInstance(); + maxRank = 0; numBins = 0; numSeqs = 0; 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; @@ -53,14 +50,14 @@ SharedOrderVector::SharedOrderVector(ifstream& f) : DataVector() { for(int i=0;i> inputData; + for (int j = 0; j < inputData; j++) { - push_back(i+1, i+1, groupN); + push_back(i, i, groupN); numSeqs++; } } - //save position in file in case next line is a new label. - pos = f.tellg(); + gobble(f); if (f.eof() != true) { f >> nextLabel; } @@ -77,53 +74,47 @@ SharedOrderVector::SharedOrderVector(ifstream& f) : DataVector() { for(int i=0;i> inputData; + for (int j = 0; j < inputData; j++) { - push_back(i+1, i+1, groupN); + push_back(i, i, groupN); numSeqs++; } } - //save position in file in case next line is a new label. - pos = f.tellg(); - + gobble(f); + 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; } - + updateStats(); + } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the SharedOrderVector class Function SharedOrderVector. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } - catch(...) { - cout << "An unknown error has occurred in the SharedOrderVector class function SharedOrderVector. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + m->errorOut(e, "SharedOrderVector", "SharedOrderVector"); exit(1); } } /***********************************************************************/ int SharedOrderVector::getNumBins(){ - if(needToUpdate == 1){ updateStats(); } return numBins; } /***********************************************************************/ int SharedOrderVector::getNumSeqs(){ - if(needToUpdate == 1){ updateStats(); } return numSeqs; } /***********************************************************************/ int SharedOrderVector::getMaxRank(){ - if(needToUpdate == 1){ updateStats(); } return maxRank; } @@ -137,8 +128,8 @@ void SharedOrderVector::set(int index, int binNumber, int abund, string groupNam data[index].group = groupName; data[index].bin = binNumber; data[index].abundance = abund; - needToUpdate = 1; - + //if (abund > maxRank) { maxRank = abund; } + updateStats(); } /***********************************************************************/ @@ -149,15 +140,18 @@ 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; newGuy.abundance = abund; newGuy.bin = binNumber; data.push_back(newGuy); - needToUpdate = 1; + //numSeqs++; + //numBins++; + //if (abund > maxRank) { maxRank = abund; } + //updateStats(); } /***********************************************************************/ @@ -172,11 +166,7 @@ void SharedOrderVector::print(ostream& output){ output << endl; } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the SharedOrderVector class Function print. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } - catch(...) { - cout << "An unknown error has occurred in the SharedOrderVector class function print. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + m->errorOut(e, "SharedOrderVector", "print"); exit(1); } } @@ -185,7 +175,7 @@ void SharedOrderVector::print(ostream& output){ /***********************************************************************/ void SharedOrderVector::resize(int){ - cout << "resize() did nothing in class SharedOrderVector"; + m->mothurOut("resize() did nothing in class SharedOrderVector"); } /***********************************************************************/ @@ -228,13 +218,9 @@ RAbundVector SharedOrderVector::getRAbundVector(){ return rav; } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the SharedOrderVector class Function getRAbundVector. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + m->errorOut(e, "SharedOrderVector", "getRAbundVector"); exit(1); } - catch(...) { - cout << "An unknown error has occurred in the SharedOrderVector class function getRAbundVector. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } } /***********************************************************************/ @@ -252,11 +238,7 @@ OrderVector SharedOrderVector::getOrderVector(map* nameMap = NULL) { return ov; } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the SharedOrderVector class Function getOrderVector. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } - catch(...) { - cout << "An unknown error has occurred in the SharedOrderVector class function getOrderVector. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + m->errorOut(e, "SharedOrderVector", "getOrderVector"); exit(1); } } @@ -286,14 +268,26 @@ SharedRAbundVector SharedOrderVector::getSharedRAbundVector(string group) { return sharedRav; } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the SharedOrderVector class Function getSharedRAbundVector. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + m->errorOut(e, "SharedOrderVector", "getSharedRAbundVector"); exit(1); } - catch(...) { - cout << "An unknown error has occurred in the SharedOrderVector class function getSharedRAbundVector. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; +} +/***********************************************************************/ +vector SharedOrderVector::getSharedRAbundVector() { + try { + SharedUtil* util; + util = new SharedUtil(); + vector lookup; + + util->setGroups(globaldata->Groups, globaldata->gGroupmap->namesOfGroups); + util->getSharedVectors(globaldata->Groups, lookup, this); + + return lookup; + } + catch(exception& e) { + m->errorOut(e, "SharedOrderVector", "getSharedRAbundVector"); exit(1); } - } /***********************************************************************/ SharedSAbundVector SharedOrderVector::getSharedSAbundVector(string group) { @@ -304,19 +298,15 @@ SharedSAbundVector SharedOrderVector::getSharedSAbundVector(string group) { } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the SharedOrderVector class Function getSharedRAbundVector. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + m->errorOut(e, "SharedOrderVector", "getSharedSAbundVector"); exit(1); } - catch(...) { - cout << "An unknown error has occurred in the SharedOrderVector class function getSharedRAbundVector. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } - } /***********************************************************************/ SharedOrderVector SharedOrderVector::getSharedOrderVector(){ + random_shuffle(data.begin(), data.end()); return *this; } @@ -329,34 +319,23 @@ void SharedOrderVector::updateStats(){ numBins = 0; maxRank = 0; - for(int i=0;i hold(numSeqs); - + numSeqs = data.size(); + + vector hold(numSeqs, 0); for(int i=0;i numBins) { numBins = data[i].bin; } - if(data[i].abundance > maxRank) { maxRank = data[i].abundance; } + 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"; + m->errorOut(e, "SharedOrderVector", "updateStats"); exit(1); } - catch(...) { - cout << "An unknown error has occurred in the SharedOrderVector class function updateStats. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } } /***********************************************************************/