//you want to do shared commands
if ((listfile != "") && (groupfile != "")) {
validateParseFiles(); //checks the listfile and groupfile parameters
- }else { //you want to do single commands
+ }else if (listfile != "") { //you want to do single commands
validateReadFiles();
validateReadPhil();
+ }else {//you are reading a shared file
+ validateReadFiles();
}
- }else if (commandName == "read.shared") {
- //you want to do shared commands with just the shared file
- validateReadFiles();
}else if (commandName == "read.tree") {
validateTreeFiles(); //checks the treefile and groupfile parameters
}else if (commandName == "deconvolute") {
}
//are you trying to cluster before you have read something
- if ((commandName == "cluster") && (globaldata->getSparseMatrix() == NULL) ||
- (commandName == "cluster") && (globaldata->getListVector() == NULL)) {
+ if (((commandName == "cluster") && (globaldata->gSparseMatrix == NULL)) ||
+ ((commandName == "cluster") && (globaldata->gListVector == NULL))) {
cout << "Before you use the cluster command, you first need to read in a distance matrix." << endl;
errorFree = false;
}