for(int j=0;j<i;j++){
- if (m->control_pressed) { outTemp.close(); remove(tempFile.c_str()); fileHandle.close(); delete reading; return 0; }
+ if (m->control_pressed) { outTemp.close(); m->mothurRemove(tempFile); fileHandle.close(); delete reading; return 0; }
fileHandle >> distance;
string outfile = m->getRootName(tempFile) + "sorted.dist.temp";
//use the unix sort
- #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+ #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
string command = "sort -n " + tempFile + " -o " + outfile;
system(command.c_str());
#else //sort using windows sort
system(command.c_str());
#endif
- if (m->control_pressed) { remove(tempFile.c_str()); remove(outfile.c_str()); delete reading; return 0; }
+ if (m->control_pressed) { m->mothurRemove(tempFile); m->mothurRemove(outfile); delete reading; return 0; }
//output to new file distance for each row and save positions in file where new row begins
ifstream in;
for(int k = 0; k < firstString.length(); k++) { in.putback(firstString[k]); }
while(!in.eof()) {
- if (m->control_pressed) { in.close(); out.close(); remove(tempFile.c_str()); remove(distFile.c_str()); remove(outfile.c_str()); delete reading; return 0; }
+ if (m->control_pressed) { in.close(); out.close(); m->mothurRemove(tempFile); m->mothurRemove(distFile); m->mothurRemove(outfile); delete reading; return 0; }
in >> first >> second >> dist; m->gobble(in);
in.close();
out.close();
- remove(tempFile.c_str());
- remove(outfile.c_str());
+ m->mothurRemove(tempFile);
+ m->mothurRemove(outfile);
- if (m->control_pressed) { remove(distFile.c_str()); delete reading; return 0; }
+ if (m->control_pressed) { m->mothurRemove(distFile); delete reading; return 0; }
}
else{ //square matrix convert directly to formatted row file
list->set(i, name);
for(int j=0;j<nseqs;j++){
- if (m->control_pressed) { fileHandle.close(); out.close(); remove(distFile.c_str()); delete reading; return 0; }
+ if (m->control_pressed) { fileHandle.close(); out.close(); m->mothurRemove(distFile); delete reading; return 0; }
fileHandle >> distance;
fileHandle.close();
out.close();
- if (m->control_pressed) { remove(distFile.c_str()); return 0; }
+ if (m->control_pressed) { m->mothurRemove(distFile); return 0; }
list->setLabel("0");