X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=weighted.cpp;h=d8a4b857ad19d8057ed4eb11a592aa11e6787721;hb=5d00ef3e809832f08efdd691a9eace8ac20feb07;hp=70f6ae3eb1d621722ebd11221e88c92cc83b78eb;hpb=19fcbbdba99658f5eca244803280f9ee7f9f6607;p=mothur.git diff --git a/weighted.cpp b/weighted.cpp index 70f6ae3..d8a4b85 100644 --- a/weighted.cpp +++ b/weighted.cpp @@ -19,7 +19,7 @@ EstOutput Weighted::getValues(Tree* t, int p, string o) { processors = p; outputDir = o; - numGroups = m->Groups.size(); + numGroups = m->getNumGroups(); if (m->control_pressed) { return data; } @@ -29,7 +29,7 @@ EstOutput Weighted::getValues(Tree* t, int p, string o) { for (int l = 0; l < i; l++) { //initialize weighted scores //WScore[globaldata->Groups[i]+globaldata->Groups[l]] = 0.0; - vector groups; groups.push_back(m->Groups[i]); groups.push_back(m->Groups[l]); + vector groups; groups.push_back((m->getGroups())[i]); groups.push_back((m->getGroups())[l]); namesOfGroupCombos.push_back(groups); } }