EstOutput Unweighted::getValues(Tree* t, int p, string o) {
try {
- globaldata = GlobalData::getInstance();
processors = p;
outputDir = o;
//if the users enters no groups then give them the score of all groups
- int numGroups = globaldata->Groups.size();
+ int numGroups = m->getNumGroups();
//calculate number of comparsions
int numComp = 0;
for (int r=0; r<numGroups; r++) {
for (int l = 0; l < r; l++) {
numComp++;
- vector<string> groups; groups.push_back(globaldata->Groups[r]); groups.push_back(globaldata->Groups[l]);
+ vector<string> groups; groups.push_back((m->getGroups())[r]); groups.push_back((m->getGroups())[l]);
namesOfGroupCombos.push_back(groups);
}
}
vector<string> groups;
if (numGroups == 0) {
//get score for all users groups
- for (int i = 0; i < tmap->namesOfGroups.size(); i++) {
- if (tmap->namesOfGroups[i] != "xxx") {
- groups.push_back(tmap->namesOfGroups[i]);
+ for (int i = 0; i < (tmap->getNamesOfGroups()).size(); i++) {
+ if ((tmap->getNamesOfGroups())[i] != "xxx") {
+ groups.push_back((tmap->getNamesOfGroups())[i]);
}
}
namesOfGroupCombos.push_back(groups);
}else {
- for (int i = 0; i < globaldata->Groups.size(); i++) {
- groups.push_back(globaldata->Groups[i]);
+ for (int i = 0; i < m->getNumGroups(); i++) {
+ groups.push_back((m->getGroups())[i]);
}
namesOfGroupCombos.push_back(groups);
}
m->gobble(in);
}
in.close();
- remove(s.c_str());
+ m->mothurRemove(s);
}
m->mothurOut("DONE."); m->mothurOutEndLine(); m->mothurOutEndLine();
EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB, int p, string o) {
try {
- globaldata = GlobalData::getInstance();
processors = p;
outputDir = o;
//if the users enters no groups then give them the score of all groups
- int numGroups = globaldata->Groups.size();
+ int numGroups = m->getNumGroups();
//calculate number of comparsions
int numComp = 0;
for (int r=0; r<numGroups; r++) {
for (int l = 0; l < r; l++) {
numComp++;
- vector<string> groups; groups.push_back(globaldata->Groups[r]); groups.push_back(globaldata->Groups[l]);
+ vector<string> groups; groups.push_back((m->getGroups())[r]); groups.push_back((m->getGroups())[l]);
namesOfGroupCombos.push_back(groups);
}
}
vector<string> groups;
if (numGroups == 0) {
//get score for all users groups
- for (int i = 0; i < tmap->namesOfGroups.size(); i++) {
- if (tmap->namesOfGroups[i] != "xxx") {
- groups.push_back(tmap->namesOfGroups[i]);
+ for (int i = 0; i < (tmap->getNamesOfGroups()).size(); i++) {
+ if ((tmap->getNamesOfGroups())[i] != "xxx") {
+ groups.push_back((tmap->getNamesOfGroups())[i]);
}
}
namesOfGroupCombos.push_back(groups);
}else {
- for (int i = 0; i < globaldata->Groups.size(); i++) {
- groups.push_back(globaldata->Groups[i]);
+ for (int i = 0; i < m->getNumGroups(); i++) {
+ groups.push_back((m->getGroups())[i]);
}
namesOfGroupCombos.push_back(groups);
}
m->gobble(in);
}
in.close();
- remove(s.c_str());
+ m->mothurRemove(s);
}
return results;
int count = 0;
- Tree* copyTree = new Tree;
+ Tree* copyTree = new Tree(tmap);
for (int h = start; h < (start+num); h++) {