X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=sharedrabundvector.cpp;h=3901650cef965dc7a3c0126ecb54a8fb425e434d;hp=70b09603be0f4cd85081f9f1b530c5ec0b61040e;hb=1a20e24ee786195ab0e1cccd4f5aede7a88f3f4e;hpb=d6c0a11d1cecfac18b323285e7ffadb7f58e848f diff --git a/sharedrabundvector.cpp b/sharedrabundvector.cpp index 70b0960..3901650 100644 --- a/sharedrabundvector.cpp +++ b/sharedrabundvector.cpp @@ -95,16 +95,36 @@ SharedRAbundVector::SharedRAbundVector(ifstream& f) : DataVector(), maxRank(0), m->binLabelsInFile.push_back(temp); } - f >> label; - } - }else { label = m->saveNextLabel; } + f >> label >> groupN >> num; + }else { + //read in first row since you know there is at least 1 group. + f >> groupN >> num; + + //make binlabels because we don't have any + string snumBins = toString(num); + m->binLabelsInFile.clear(); + for (int i = 0; i < num; i++) { + //if there is a bin label use it otherwise make one + string binLabel = "Otu"; + string sbinNumber = toString(i+1); + if (sbinNumber.length() < snumBins.length()) { + int diff = snumBins.length() - sbinNumber.length(); + for (int h = 0; h < diff; h++) { binLabel += "0"; } + } + binLabel += sbinNumber; + m->binLabelsInFile.push_back(binLabel); + } + } + }else { + label = m->saveNextLabel; + + //read in first row since you know there is at least 1 group. + f >> groupN >> num; + } //reset labels, currentLabels may have gotten changed as otus were eliminated because of group choices or sampling m->currentBinLabels = m->binLabelsInFile; - //read in first row since you know there is at least 1 group. - f >> groupN >> num; - holdLabel = label; //add new vector to lookup