}
}
catch(exception& e) {
- errorOut(e, "SharedRAbundVector", "SharedRAbundVector");
+ m->errorOut(e, "SharedRAbundVector", "SharedRAbundVector");
exit(1);
}
}
string holdLabel, nextLabel, groupN;
individual newguy;
- for (int i = 0; i < lookup.size(); i++) { delete lookup[i]; }
+ for (int i = 0; i < lookup.size(); i++) { delete lookup[i]; lookup[i] = NULL; }
lookup.clear();
//read in first row since you know there is at least 1 group.
for(int i=0;i<num;i++){
f >> inputData;
- lookup[0]->push_back(inputData, i, groupN); //abundance, bin, group
- push_back(inputData, i, groupN);
- numSeqs += inputData;
- numBins++;
+ lookup[0]->push_back(inputData, groupN); //abundance, bin, group
+ push_back(inputData, groupN);
+ //numSeqs += inputData;
+ //numBins++;
if (inputData > maxRank) { maxRank = inputData; }
}
+ gobble(f);
+
if (f.eof() != true) { f >> nextLabel; }
//read the rest of the groups info in
//fill vector.
for(int i=0;i<num;i++){
f >> inputData;
- lookup[count]->push_back(inputData, i, groupN); //abundance, bin, group
+ lookup[count]->push_back(inputData, groupN); //abundance, bin, group
}
+ gobble(f);
if (f.eof() != true) { f >> nextLabel; }
}
}
catch(exception& e) {
- errorOut(e, "SharedRAbundVector", "SharedRAbundVector");
+ m->errorOut(e, "SharedRAbundVector", "SharedRAbundVector");
exit(1);
}
}
numSeqs += (newBinSize - oldBinSize);
}
catch(exception& e) {
- errorOut(e, "SharedRAbundVector", "set");
+ m->errorOut(e, "SharedRAbundVector", "set");
exit(1);
}
}
}
/***********************************************************************/
-void SharedRAbundVector::push_back(int binSize, int otu, string groupName){
+void SharedRAbundVector::push_back(int binSize, string groupName){
try {
individual newGuy;
newGuy.abundance = binSize;
newGuy.group = groupName;
- newGuy.bin = otu;
+ newGuy.bin = data.size();
data.push_back(newGuy);
numBins++;
numSeqs += binSize;
}
catch(exception& e) {
- errorOut(e, "SharedRAbundVector", "push_back");
+ m->errorOut(e, "SharedRAbundVector", "push_back");
exit(1);
}
}
numSeqs += binSize;
}
catch(exception& e) {
- errorOut(e, "SharedRAbundVector", "insert");
+ m->errorOut(e, "SharedRAbundVector", "insert");
exit(1);
}
}
numSeqs += binSize;
}
catch(exception& e) {
- errorOut(e, "SharedRAbundVector", "push_front");
+ m->errorOut(e, "SharedRAbundVector", "push_front");
exit(1);
}
}
output << endl;
}
catch(exception& e) {
- errorOut(e, "SharedRAbundVector", "print");
+ m->errorOut(e, "SharedRAbundVector", "print");
exit(1);
}
}
for (int i = 0; i < lookup.size(); i++) {
//if this sharedrabund is not from a group the user wants then delete it.
if (util->isValidGroup(lookup[i]->getGroup(), globaldata->Groups) == false) {
- delete lookup[i];
+ delete lookup[i]; lookup[i] = NULL;
lookup.erase(lookup.begin()+i);
i--;
}
return lookup;
}
catch(exception& e) {
- errorOut(e, "SharedRAbundVector", "getSharedRAbundVectors");
+ m->errorOut(e, "SharedRAbundVector", "getSharedRAbundVectors");
exit(1);
}
}
return rav;
}
catch(exception& e) {
- errorOut(e, "SharedRAbundVector", "getRAbundVector");
+ m->errorOut(e, "SharedRAbundVector", "getRAbundVector");
exit(1);
}
}
return rav;
}
catch(exception& e) {
- errorOut(e, "SharedRAbundVector", "getRAbundVector2");
+ m->errorOut(e, "SharedRAbundVector", "getRAbundVector2");
exit(1);
}
}
return sav;
}
catch(exception& e) {
- errorOut(e, "SharedRAbundVector", "getSharedSAbundVector");
+ m->errorOut(e, "SharedRAbundVector", "getSharedSAbundVector");
exit(1);
}
}
return sav;
}
catch(exception& e) {
- errorOut(e, "SharedRAbundVector", "getSAbundVector");
+ m->errorOut(e, "SharedRAbundVector", "getSAbundVector");
exit(1);
}
}
return ov;
}
catch(exception& e) {
- errorOut(e, "SharedRAbundVector", "getSharedOrderVector");
+ m->errorOut(e, "SharedRAbundVector", "getSharedOrderVector");
exit(1);
}
}
return ov;
}
catch(exception& e) {
- errorOut(e, "SharedRAbundVector", "getOrderVector");
+ m->errorOut(e, "SharedRAbundVector", "getOrderVector");
exit(1);
}
}