openOutputFile(sumFile, outSum);
distFile = globaldata->getTreeFile() + ".wdistrib";
openOutputFile(distFile, outDist);
-
- numGroups = tmap->getNumGroups();
+
+ //if the user has not entered specific groups to analyze then do them all
+ if (globaldata->Groups.size() == 0) {
+ numGroups = tmap->getNumGroups();
+ }else {
+ //check that groups are valid
+ for (int i = 0; i < globaldata->Groups.size(); i++) {
+ if (tmap->isValidGroup(globaldata->Groups[i]) != true) {
+ cout << globaldata->Groups[i] << " is not a valid group, and will be disregarded." << endl;
+ // erase the invalid group from globaldata->Groups
+ globaldata->Groups.erase (globaldata->Groups.begin()+i);
+ }
+ }
+
+ //if the user only entered invalid groups
+ if (globaldata->Groups.size() == 0) {
+ numGroups = tmap->getNumGroups();
+ cout << "When using the groups parameter you must have at least 2 valid groups. I will run the command using all the groups in your groupfile." << endl;
+ }else if (globaldata->Groups.size() == 1) {
+ cout << "When using the groups parameter you must have at least 2 valid groups. I will run the command using all the groups in your groupfile." << endl;
+ numGroups = tmap->getNumGroups();
+ globaldata->Groups.clear();
+ }else { numGroups = globaldata->Groups.size(); }
+ }
//calculate number of comparisons i.e. with groups A,B,C = AB, AC, BC = 3;
numComp = 0;
numComp += i;
for (int l = n; l < numGroups; l++) {
//set group comparison labels
- groupComb.push_back(tmap->namesOfGroups[i-1]+tmap->namesOfGroups[l]);
+ if (globaldata->Groups.size() != 0) {
+ groupComb.push_back(globaldata->Groups[i-1]+globaldata->Groups[l]);
+ }else {
+ groupComb.push_back(tmap->namesOfGroups[i-1]+tmap->namesOfGroups[l]);
+ }
}
n++;
}
//copy T[i]'s info.
randT->getCopy(T[i]);
- //get pscores for random trees
+ //get scores for random trees
for (int j = 0; j < iters; j++) {
//create a random tree with same topology as T[i], but different labels
randT->assembleRandomUnifracTree();
float ucumul = 0.0000;
float rcumul = 0.0000;
//this loop fills the cumulative maps and put 0.0000 in the score freq map to make it easier to print.
- for (it = validScores[b].begin(); it != validScores[b].end(); it++) {
+ for (it = validScores[b].end(); it == validScores[b].begin(); it--) {
it2 = uscoreFreq[b].find(it->first);
//user data has that score
if (it2 != uscoreFreq[b].end()) { uscoreFreq[b][it->first] /= T.size(); ucumul+= it2->second; }
//reset randomTree parameter to 0
globaldata->setRandomTree("0");
+ //clear out users groups
+ globaldata->Groups.clear();
delete randT;