};
/**************************************************************************************************/
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
#else
static DWORD WINAPI MyUchimeThreadFunction(LPVOID lpParam){
uchimeData* pDataArray;
try {
+ pDataArray->outputFName = pDataArray->m->getFullPathName(pDataArray->outputFName);
+ pDataArray->filename = pDataArray->m->getFullPathName(pDataArray->filename);
+ pDataArray->alns = pDataArray->m->getFullPathName(pDataArray->alns);
+
//clears files
ofstream out, out1, out2;
pDataArray->m->openOutputFile(pDataArray->outputFName, out); out.close();
path = path.substr(0, (tempPath.find_last_of('m')));
string uchimeCommand = path;
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
uchimeCommand += "uchime ";
#else
uchimeCommand += "uchime";
cPara.push_back(tempIdsmoothwindow);
}
- /*if (useMinsmoothid) {
- char* tempminsmoothid = new char[14];
- //strcpy(tempminsmoothid, "--minsmoothid");
- *tempminsmoothid = '\0'; strncat(tempminsmoothid, "--minsmoothid", 13);
- cPara.push_back(tempminsmoothid);
- char* tempMinsmoothid = new char[minsmoothid.length()+1];
- *tempMinsmoothid = '\0'; strncat(tempMinsmoothid, minsmoothid.c_str(), minsmoothid.length());
- //strcpy(tempMinsmoothid, minsmoothid.c_str());
- cPara.push_back(tempMinsmoothid);
- }*/
-
if (pDataArray->useMaxp) {
char* tempmaxp = new char[7];
//strcpy(tempmaxp, "--maxp");
//uchime_main(numArgs, uchimeParameters);
//cout << "commandString = " << commandString << endl;
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
#else
commandString = "\"" + commandString + "\"";
#endif
try {
+ pDataArray->outputFName = pDataArray->m->getFullPathName(pDataArray->outputFName);
+ pDataArray->filename = pDataArray->m->getFullPathName(pDataArray->filename);
+ pDataArray->alns = pDataArray->m->getFullPathName(pDataArray->alns);
+
int totalSeqs = 0;
int numChimeras = 0;