//read in group map info.
treeMap = new TreeMap(globaldata->getGroupFile());
treeMap->readMap();
+
+ //memory leak prevention
+ if (globaldata->gTreemap != NULL) { delete globaldata->gTreemap; }
globaldata->gTreemap = treeMap;
read = new ReadNewickTree(filename);
int ReadTreeCommand::execute(){
try {
-
- read->read();
+ int readOk;
+
+ readOk = read->read();
+
+ if (readOk != 0) { cout << "Read Terminated." << endl; globaldata->gTree.clear(); delete globaldata->gTreemap; return 0; }
- Tree* T = globaldata->gTree;
-// T->createNewickFile();
+ vector<Tree*> T = globaldata->gTree;
+ //assemble users trees
+ for (int i = 0; i < T.size(); i++) {
+ T[i]->assembleTree();
+ }
+
return 0;
}
catch(exception& e) {
exit(1);
}
}
-//**********************************************************************************************************************
\ No newline at end of file
+
+//**********************************************************************************************************************