lines.push_back(linePair(startPos, numPairsPerProcessor));
}
-
data = createProcesses(t, namesOfGroupCombos);
lines.clear();
}
}
}else if ((nodePcountSize[lc] == 0) && (nodePcountSize[rc] == 0)) { tempTotals[i] = 0.0; //we don't care about you
}else { //if no, your tempTotal is your childrens temp totals + your branch length
- tempTotals[i] = tempTotals[lc] + tempTotals[rc] + abs(t->tree[i].getBranchLength());
+ if (t->tree[i].getBranchLength() != -1) {
+ tempTotals[i] = tempTotals[lc] + tempTotals[rc] + abs(t->tree[i].getBranchLength());
+ }else {
+ tempTotals[i] = tempTotals[lc] + tempTotals[rc];
+ }
}
//cout << "temptotal = "<< tempTotals[i] << endl;
}
}
lines.push_back(linePair(startPos, numPairsPerProcessor));
}
-
+
data = createProcesses(t, namesOfGroupCombos, true);
lines.clear();
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);
}
}else if ((nodePcountSize[lc] == 0) && (nodePcountSize[rc] == 0)) { tempTotals[i] = 0.0; //we don't care about you
}else { //if no, your tempTotal is your childrens temp totals + your branch length
- tempTotals[i] = tempTotals[lc] + tempTotals[rc] + abs(copyTree->tree[i].getBranchLength());
+ if (t->tree[i].getBranchLength() != -1) {
+ tempTotals[i] = tempTotals[lc] + tempTotals[rc] + abs(copyTree->tree[i].getBranchLength());
+ }else {
+ tempTotals[i] = tempTotals[lc] + tempTotals[rc];
+ }
}
}