X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=unweighted.cpp;h=ea66294a5354c7cab7c265c3213a967a4a5a01f9;hb=e88ba6b7a994a8502030d38cc5cc542994694d4d;hp=24b41a1d03317e343e05c65c7516e94778cd557c;hpb=0486bc2eed084ac387d2f59b6d23d13b2382daf7;p=mothur.git diff --git a/unweighted.cpp b/unweighted.cpp index 24b41a1..ea66294 100644 --- a/unweighted.cpp +++ b/unweighted.cpp @@ -66,7 +66,6 @@ EstOutput Unweighted::getValues(Tree* t, int p, string o) { lines.push_back(linePair(startPos, numPairsPerProcessor)); } - data = createProcesses(t, namesOfGroupCombos); lines.clear(); } @@ -317,7 +316,7 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB, int p, st } lines.push_back(linePair(startPos, numPairsPerProcessor)); } - + data = createProcesses(t, namesOfGroupCombos, true); lines.clear(); @@ -392,12 +391,13 @@ EstOutput Unweighted::createProcesses(Tree* t, vector< vector > namesOfG if (!in.eof()) { int num; in >> num; m->gobble(in); - + if (m->control_pressed) { break; } double w; for (int j = 0; j < num; j++) { in >> w; + results.push_back(w); } m->gobble(in);