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();
+ if (globaldata->saveNextLabel == "") { f >> label; }
+ else { label = globaldata->saveNextLabel; }
+
//read in first row since you know there is at least 1 group.
- f >> label >> groupN >> num;
+ f >> groupN >> num;
+
holdLabel = label;
//add new vector to lookup
lookup[0]->push_back(inputData, groupN); //abundance, bin, group
push_back(inputData, groupN);
- numSeqs += inputData;
- numBins++;
+ //numSeqs += inputData;
+ //numBins++;
if (inputData > maxRank) { maxRank = inputData; }
-
}
- gobble(f);
-
- if (f.eof() != true) { f >> nextLabel; }
+ m->gobble(f);
+ if (!(f.eof())) { f >> nextLabel; }
+
//read the rest of the groups info in
while ((nextLabel == holdLabel) && (f.eof() != true)) {
f >> groupN >> num;
if (globaldata->gGroupmap == NULL) {
//save group in groupmap
+
groupmap->namesOfGroups.push_back(groupN);
groupmap->groupIndex[groupN] = count;
}
lookup[count]->push_back(inputData, groupN); //abundance, bin, group
}
- gobble(f);
+ m->gobble(f);
if (f.eof() != true) { f >> nextLabel; }
}
-
- //put file pointer back since you are now at a new distance label
- for (int i = 0; i < nextLabel.length(); i++) { f.unget(); }
+
+ globaldata->saveNextLabel = nextLabel;
if (globaldata->gGroupmap == NULL) { globaldata->gGroupmap = groupmap; }
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--;
}