readMatrix->read(nameMap);
}else if (countfile != "") {
ct = new CountTable();
- ct->readTable(countfile);
+ ct->readTable(countfile, true);
readMatrix->read(ct);
}else {
readMatrix->read(nameMap);
}else {
m->clearGroups();
Groups.clear();
+ m->Treenames.clear();
vector<SharedRAbundVector*> temp;
for (int i = 0; i < lookup.size(); i++) {
if (lookup[i]->getNumSeqs() < subsampleSize) {
}else {
Groups.push_back(lookup[i]->getGroup());
temp.push_back(lookup[i]);
+ m->Treenames.push_back(lookup[i]->getGroup());
}
}
lookup = temp;
//Close all thread handles and free memory allocations.
for(int i=0; i < pDataArray.size(); i++){
+ if (pDataArray[i]->count != (pDataArray[i]->end-pDataArray[i]->start)) {
+ m->mothurOut("[ERROR]: process " + toString(i) + " only processed " + toString(pDataArray[i]->count) + " of " + toString(pDataArray[i]->end-pDataArray[i]->start) + " groups assigned to it, quitting. \n"); m->control_pressed = true;
+ }
for (int j = 0; j < pDataArray[i]->thisLookup.size(); j++) { delete pDataArray[i]->thisLookup[j]; }
for (int k = 0; k < calcDists.size(); k++) {
for (int i = 0; i < calcDists.size(); i++) { calcDists[i].clear(); }
}
}
-
+
+ if (m->debug) { m->mothurOut("[DEBUG]: done with iters.\n"); }
+
if (iters != 1) {
//we need to find the average distance and standard deviation for each groups distance
vector< vector<seqDist> > calcAverages = m->getAverages(calcDistsTotals);
+ if (m->debug) { m->mothurOut("[DEBUG]: found averages.\n"); }
+
//create average tree for each calc
for (int i = 0; i < calcDists.size(); i++) {
vector< vector<double> > matrix; //square matrix to represent the distance
if (newTree != NULL) { writeTree(outputFile, newTree); }
}
+ if (m->debug) { m->mothurOut("[DEBUG]: done averages trees.\n"); }
+
//create all trees for each calc and find their consensus tree
for (int i = 0; i < calcDists.size(); i++) {
if (m->control_pressed) { break; }
int row = calcDistsTotals[myIter][i][j].seq1;
int column = calcDistsTotals[myIter][i][j].seq2;
double dist = calcDistsTotals[myIter][i][j].dist;
-
+
matrix[row][column] = dist;
matrix[column][row] = dist;
}
outAll.close();
if (m->control_pressed) { for (int k = 0; k < trees.size(); k++) { delete trees[k]; } }
+ if (m->debug) { m->mothurOut("[DEBUG]: done all trees.\n"); }
+
Consensus consensus;
//clear old tree names if any
m->Treenames.clear(); m->Treenames = m->getGroups(); //may have changed if subsample eliminated groups
Tree* conTree = consensus.getTree(trees);
+ if (m->debug) { m->mothurOut("[DEBUG]: done cons tree.\n"); }
+
//create a new filename
variables["[tag]"] = "cons";
string conFile = getOutputFileName("tree",variables);