for(int i=0;i<num;i++){
f >> inputData;
- lookup[0]->push_back(inputData, i, groupN); //abundance, bin, group
- push_back(inputData, i, groupN);
+ 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; }
}
}
/***********************************************************************/
-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++;
RAbundVector SharedRAbundVector::getRAbundVector() {
try {
- RAbundVector rav(data.size());
+ RAbundVector rav;
for (int i = 0; i < data.size(); i++) {
- rav.set(i, data[i].abundance);
+ if(data[i].abundance != 0) {
+ rav.push_back(data[i].abundance);
+ }
}
-
+
+ rav.setLabel(label);
return rav;
}
catch(exception& e) {