X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=distancecommand.cpp;h=67ad7beb77b69d72f11914579246eb35dfa707e4;hb=163b300cfd7d4ca4e70c454be20f07b1d8346650;hp=e2ca937ed971e87194fd3623c48aec343d2f3ca5;hpb=4f4070ac3fbb5da75f834b48062e9123364b006e;p=mothur.git

diff --git a/distancecommand.cpp b/distancecommand.cpp
index e2ca937..67ad7be 100644
--- a/distancecommand.cpp
+++ b/distancecommand.cpp
@@ -16,47 +16,84 @@
 
 //**********************************************************************************************************************
 
-DistanceCommand::DistanceCommand(){
+DistanceCommand::DistanceCommand(string option){
 	try {
-		globaldata = GlobalData::getInstance();
-		validCalculator = new ValidCalculators();
-		countends = globaldata->getCountEnds();
-		convert(globaldata->getProcessors(), processors);
-		convert(globaldata->getCutOff(), cutoff);
+		abort = false;
+		Estimators.clear();
 		
-		//open file
-		string filename = globaldata->getFastaFile();
-		openInputFile(filename, in);
-
+		//allow user to run help
+		if(option == "help") { help(); abort = true; }
 		
-		int i;
-		if (isTrue(countends) == true) {
-			for (i=0; i<globaldata->Estimators.size(); i++) {
-				if (validCalculator->isValidCalculator("distance", globaldata->Estimators[i]) == true) { 
-					if (globaldata->Estimators[i] == "nogaps") { 
-						distCalculator = new ignoreGaps();
-					}else if (globaldata->Estimators[i] == "eachgap") { 
-						distCalculator = new eachGapDist();	
-					}else if (globaldata->Estimators[i] == "onegap") {
-					distCalculator = new oneGapDist();					}
-				}
+		else {
+			//valid paramters for this command
+			string Array[] =  {"fasta", "phylip", "calc", "countends", "cutoff", "processors"};
+			vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
+			
+			OptionParser parser(option);
+			map<string, string> parameters = parser.getParameters();
+			
+			ValidParameters validParameter;
+		
+			//check to make sure all parameters are valid for command
+			for (map<string, string>::iterator it2 = parameters.begin(); it2 != parameters.end(); it2++) { 
+				if (validParameter.isValidParameter(it2->first, myArray, it2->second) != true) {  abort = true;  }
+			}
+			
+			//check for required parameters
+			fastafile = validParameter.validFile(parameters, "fasta", true);
+			if (fastafile == "not found") { cout << "fasta is a required parameter for the dist.seqs command." << endl; abort = true; }
+			else if (fastafile == "not open") { abort = true; }	
+			else{
+				ifstream inFASTA;
+				openInputFile(fastafile, inFASTA);
+				alignDB = SequenceDB(inFASTA); 
+				inFASTA.close();
 			}
-		}else {
-			for (i=0; i<globaldata->Estimators.size(); i++) {
-				if (validCalculator->isValidCalculator("distance", globaldata->Estimators[i]) == true) { 
-					if (globaldata->Estimators[i] == "nogaps") { 
-						distCalculator = new ignoreGaps();	
-					}else if (globaldata->Estimators[i] == "eachgap") { 
-						distCalculator = new eachGapIgnoreTermGapDist();
-					}else if (globaldata->Estimators[i] == "onegap") { 
-						distCalculator = new oneGapIgnoreTermGapDist();	
+
+			//check for optional parameter and set defaults
+			// ...at some point should added some additional type checking...
+			calc = validParameter.validFile(parameters, "calc", false);			
+			if (calc == "not found") { calc = "onegap";  }
+			else { 
+				 if (calc == "default")  {  calc = "onegap";  }
+			}
+			splitAtDash(calc, Estimators);
+
+			string temp;
+			temp = validParameter.validFile(parameters, "countends", false);	if(temp == "not found"){	temp = "T";	}
+			convert(temp, countends); 
+			
+			temp = validParameter.validFile(parameters, "cutoff", false);		if(temp == "not found"){	temp = "1.0"; }
+			convert(temp, cutoff); 
+			
+			temp = validParameter.validFile(parameters, "processors", false);	if(temp == "not found"){	temp = "1"; }
+			convert(temp, processors); 
+			
+			phylip = validParameter.validFile(parameters, "phylip", false);		if(phylip == "not found"){	phylip = "F"; }
+	
+			
+			ValidCalculators validCalculator;
+			
+			if (isTrue(countends) == true) {
+				for (int i=0; i<Estimators.size(); i++) {
+					if (validCalculator.isValidCalculator("distance", Estimators[i]) == true) { 
+						if (Estimators[i] == "nogaps")			{	distCalculator = new ignoreGaps();	}
+						else if (Estimators[i] == "eachgap")	{	distCalculator = new eachGapDist();	}
+						else if (Estimators[i] == "onegap")		{	distCalculator = new oneGapDist();	}
+					}
+				}
+			}else {
+				for (int i=0; i<Estimators.size(); i++) {
+					if (validCalculator.isValidCalculator("distance", Estimators[i]) == true) { 
+						if (Estimators[i] == "nogaps")		{	distCalculator = new ignoreGaps();					}
+						else if (Estimators[i] == "eachgap"){	distCalculator = new eachGapIgnoreTermGapDist();	}
+						else if (Estimators[i] == "onegap")	{	distCalculator = new oneGapIgnoreTermGapDist();		}
 					}
 				}
 			}
+
 		}
-		
-		//reset calc for next command
-		globaldata->setCalc("");
+				
 	}
 	catch(exception& e) {
 		cout << "Standard Error: " << e.what() << " has occurred in the DistanceCommand class Function DistanceCommand. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
@@ -67,234 +104,100 @@ DistanceCommand::DistanceCommand(){
 		exit(1);
 	}	
 }
+
+//**********************************************************************************************************************
+
+DistanceCommand::~DistanceCommand(){
+	
+	for(int i=0;i<lines.size();i++){
+		delete lines[i];
+	}
+	
+}
+	
+//**********************************************************************************************************************
+
+void DistanceCommand::help(){
+	try {
+		cout << "The dist.seqs command reads a file containing sequences and creates a distance file." << "\n";
+		cout << "The dist.seqs command parameters are fasta, calc, countends, cutoff and processors.  " << "\n";
+		cout << "The fasta parameter is required." << "\n";
+		cout << "The calc parameter allows you to specify the method of calculating the distances.  Your options are: nogaps, onegap or eachgap. The default is onegap." << "\n";
+		cout << "The countends parameter allows you to specify whether to include terminal gaps in distance.  Your options are: T or F. The default is T." << "\n";
+		cout << "The cutoff parameter allows you to specify maximum distance to keep. The default is 1.0." << "\n";
+		cout << "The processors parameter allows you to specify number of processors to use.  The default is 1." << "\n";
+		cout << "The dist.seqs command should be in the following format: " << "\n";
+		cout << "dist.seqs(fasta=yourFastaFile, calc=yourCalc, countends=yourEnds, cutoff= yourCutOff, processors=yourProcessors) " << "\n";
+		cout << "Example dist.seqs(fasta=amazon.fasta, calc=eachgap, countends=F, cutoff= 2.0, processors=3)." << "\n";
+		cout << "Note: No spaces between parameter labels (i.e. calc), '=' and parameters (i.e.yourCalc)." << "\n" << "\n";
+	}
+	catch(exception& e) {
+		cout << "Standard Error: " << e.what() << " has occurred in the DistanceCommand class Function help. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+		exit(1);
+	}
+	catch(...) {
+		cout << "An unknown error has occurred in the DistanceCommand class function help. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+		exit(1);
+	}	
+}
+
+
 //**********************************************************************************************************************
 
 int DistanceCommand::execute(){
 	try {
 		
-		//reads fasta file and fills sequenceDB
-		if(globaldata->getFastaFile() != "") {  seqDB = new SequenceDB(in);  }
-		else { cout << "Error no fasta file." << endl; return 0; }
-				
-		int numSeqs = seqDB->getNumSeqs();
-		cutoff += 0.005;
-		
-		string distFile = getRootName(globaldata->getFastaFile()) + "dist";
-		string phylipFile = getRootName(globaldata->getFastaFile()) + "phylip.dist";
+		if (abort == true) { return 0; }
 		
-		remove(phylipFile.c_str());
-		remove(distFile.c_str());
+		int numSeqs = alignDB.getNumSeqs();
+		cutoff += 0.005;
 		
-		//output numSeqs to phylip formatted dist file
-		openOutputFile(phylipFile, phylipOut);
-		phylipOut << numSeqs << endl;
-		phylipOut.close();
+		string outputFile;
 		
+		//doses the user want the phylip formatted file as well
+		if (isTrue(phylip) == true) {
+			outputFile = getRootName(fastafile) + "phylip.dist";
+			remove(outputFile.c_str());
+			
+			//output numSeqs to phylip formatted dist file
+		}else { //user wants column format
+			outputFile = getRootName(fastafile) + "dist";
+			remove(outputFile.c_str());
+		}
+				
 		//#	if defined (_WIN32)
 		//figure out how to implement the fork and wait commands in windows
 		//	driver(distCalculator, seqDB, 0, numSeqs, distFile, phylipFile, cutoff);
 		//#	endif
 		
-#if defined (__APPLE__) || (__MACH__)
+				
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+		//if you don't need to fork anything
 		if(processors == 1){
-			driver(distCalculator, seqDB, 0, numSeqs, distFile, phylipFile + "tempPhylipA", cutoff);
-			appendFiles((phylipFile + "tempPhylipA"), phylipFile);
-			remove((phylipFile + "tempPhylipA").c_str());	
-		}	
-		else if(processors == 2){
+			driver(0, numSeqs, outputFile, cutoff);
+		}else{ //you have multiple processors
 			
-			int pid = fork();
-			if(pid > 0){
-				driver(distCalculator, seqDB, 0, (numSeqs/sqrt(2)), distFile + "tempa", phylipFile + "tempPhylipA", cutoff);	
-				appendFiles((distFile+"tempa"), distFile);
-				remove((distFile + "tempa").c_str());
-				appendFiles((phylipFile + "tempPhylipA"), phylipFile);
-				remove((phylipFile + "tempPhylipA").c_str());
-			}
-			else{
-				driver(distCalculator, seqDB, (numSeqs/sqrt(2)), numSeqs, distFile + "tempb", phylipFile + "tempPhylipB", cutoff);	
-				appendFiles((distFile+"tempb"), distFile);
-				remove((distFile + "tempb").c_str());
-				appendFiles((phylipFile + "tempPhylipB"), phylipFile);
-				remove((phylipFile + "tempPhylipB").c_str());	
-			}
-			wait(NULL);
-			
-		}
-		else if(processors == 3){
-			int pid1 = fork();
-			if(pid1 > 0){
-				int pid2 = fork();
-				if(pid2 > 0){
-					driver(distCalculator, seqDB, 0, sqrt(3) * numSeqs / 3, distFile + "tempa", phylipFile + "tempPhylipA", cutoff);
-					appendFiles(distFile+"tempa", distFile);
-					appendFiles((phylipFile + "tempPhylipA"), phylipFile);
-					remove((distFile + "tempa").c_str());
-					remove((phylipFile + "tempPhylipA").c_str());	
-				}
-				else{
-					driver(distCalculator, seqDB, sqrt(3) * numSeqs / 3, sqrt(6) * numSeqs / 3, distFile + "tempb", phylipFile + "tempPhylipB", cutoff);	
-					appendFiles(distFile+"tempb", distFile);
-					appendFiles((phylipFile + "tempPhylipB"), phylipFile);
-					remove((distFile + "tempb").c_str());	
-					remove((phylipFile + "tempPhylipB").c_str());			
-				}
-				wait(NULL);
-			}
-			else{
-				driver(distCalculator, seqDB, sqrt(6) * numSeqs / 3, numSeqs, distFile + "tempc", phylipFile + "tempPhylipC", cutoff);	
-				appendFiles(distFile+"tempc", distFile);
-				appendFiles((phylipFile + "tempPhylipC"), phylipFile);
-				remove((distFile + "tempc").c_str());	
-				remove((phylipFile + "tempPhylipC").c_str());		
-			}
-			wait(NULL);
-		}
-		else if(processors == 4){
-			int pid1 = fork();
-			if(pid1 > 0){
-				int pid2 = fork();
-				if(pid2 > 0){
-					driver(distCalculator, seqDB, 0, numSeqs / 2, distFile + "tempa", phylipFile + "tempPhylipA", cutoff);	
-					appendFiles(distFile+"tempa", distFile);
-					appendFiles((phylipFile + "tempPhylipA"), phylipFile);
-					remove((distFile + "tempa").c_str());
-					remove((phylipFile + "tempPhylipA").c_str());			
-				}
-				else{
-					driver(distCalculator, seqDB, numSeqs / 2, (numSeqs/sqrt(2)), distFile + "tempb", phylipFile + "tempPhylipB", cutoff);	
-					appendFiles(distFile+"tempb", distFile);
-					appendFiles((phylipFile + "tempPhylipB"), phylipFile);
-					remove((distFile + "tempb").c_str());
-					remove((phylipFile + "tempPhylipB").c_str());				
-				}
-				wait(NULL);
+			for (int i = 0; i < processors; i++) {
+				lines.push_back(new linePair());
+				lines[i]->start = int (sqrt(float(i)/float(processors)) * numSeqs);
+				lines[i]->end = int (sqrt(float(i+1)/float(processors)) * numSeqs);
 			}
-			else{
-				int pid3 = fork();
-				if(pid3 > 0){
-					driver(distCalculator, seqDB, (numSeqs/sqrt(2)), (sqrt(3) * numSeqs / 2), distFile + "tempc", phylipFile + "tempPhylipC", cutoff);	
-					appendFiles(distFile+"tempc", distFile);
-					appendFiles((phylipFile + "tempPhylipC"), phylipFile);
-					remove((distFile + "tempc").c_str());
-					remove((phylipFile + "tempPhylipC").c_str());	
-								
-				}
-				else{
-					driver(distCalculator, seqDB, (sqrt(3) * numSeqs / 2), numSeqs, distFile + "tempd", phylipFile + "tempPhylipD", cutoff);	
-					appendFiles(distFile+"tempd", distFile);
-					appendFiles((phylipFile + "tempPhylipD"), phylipFile);
-					remove((distFile + "tempd").c_str());	
-					remove((phylipFile + "tempPhylipD").c_str());			
-				}
-				wait(NULL);
-			}
-			wait(NULL);
-		}
-		wait(NULL);
-#elif (linux) || (__linux)
-		if(processors == 1){
-			driver(distCalculator, seqDB, 0, numSeqs, distFile, phylipFile + "tempPhylipA", cutoff);
-			appendFiles((phylipFile + "tempPhylipA"), phylipFile);	
-			remove((phylipFile + "tempPhylipA").c_str());	
-		}	
-		else if(processors == 2){
-			
-			int pid = fork();
-			if(pid > 0){
-				driver(distCalculator, seqDB, 0, (numSeqs/sqrt(2)), distFile + "tempa", phylipFile + "tempPhylipA", cutoff);	
-				appendFiles((distFile+"tempa"), distFile);
-				appendFiles((phylipFile + "tempPhylipA"), phylipFile);
-				remove((distFile + "tempa").c_str());	
-				remove((phylipFile + "tempPhylipA").c_str());
 
-			}
-			else{
-				driver(distCalculator, seqDB, (numSeqs/sqrt(2)), numSeqs, distFile + "tempb", phylipFile + "tempPhylipB", cutoff);	
-				appendFiles((distFile+"tempb"), distFile);
-				appendFiles((phylipFile + "tempPhylipB"), phylipFile);
-				remove((distFile + "tempb").c_str());
-				remove((phylipFile + "tempPhylipB").c_str());	
-			}
-			wait();
+			createProcesses(outputFile); 
+		
+			map<int, int>::iterator it = processIDS.begin();
+			rename((outputFile + toString(it->second) + ".temp").c_str(), outputFile.c_str());
+			it++;
 			
-		}
-		else if(processors == 3){
-			int pid1 = fork();
-			if(pid1 > 0){
-				int pid2 = fork();
-				if(pid2 > 0){
-					driver(distCalculator, seqDB, 0, (numSeqs/sqrt(2)), distFile + "tempa", phylipFile + "tempPhylipA", cutoff);	
-					appendFiles((distFile+"tempa"), distFile);
-					appendFiles((phylipFile + "tempPhylipA"), phylipFile);
-					remove((distFile + "tempa").c_str());	
-					remove((phylipFile + "tempPhylipA").c_str());
-
-				}
-				else{
-					driver(distCalculator, seqDB, (numSeqs/sqrt(2)), numSeqs, distFile + "tempb", phylipFile + "tempPhylipB", cutoff);	
-					appendFiles((distFile+"tempb"), distFile);
-					appendFiles((phylipFile + "tempPhylipB"), phylipFile);
-					remove((distFile + "tempb").c_str());
-					remove((phylipFile + "tempPhylipB").c_str());	
-				}
-				wait();
-			}
-			else{
-				driver(distCalculator, seqDB, sqrt(6) * numSeqs / 3, numSeqs, distFile + "tempc", phylipFile + "tempPhylipC", cutoff);	
-				appendFiles(distFile+"tempc", distFile);
-				appendFiles((phylipFile + "tempPhylipC"), phylipFile);
-				remove((distFile + "tempc").c_str());	
-				remove((phylipFile + "tempPhylipC").c_str());				
-			}
-			wait();
-		}
-		else if(processors == 4){
-			int pid1 = fork();
-			if(pid1 > 0){
-				int pid2 = fork();
-				if(pid2 > 0){
-					driver(distCalculator, seqDB, 0, (numSeqs/sqrt(2)), distFile + "tempa", phylipFile + "tempPhylipA", cutoff);	
-					appendFiles((distFile+"tempa"), distFile);
-					appendFiles((phylipFile + "tempPhylipA"), phylipFile);
-					remove((distFile + "tempa").c_str());	
-					remove((phylipFile + "tempPhylipA").c_str());
-				}
-				else{
-					driver(distCalculator, seqDB, (numSeqs/sqrt(2)), numSeqs, distFile + "tempb", phylipFile + "tempPhylipB", cutoff);	
-					appendFiles((distFile+"tempb"), distFile);
-					appendFiles((phylipFile + "tempPhylipB"), phylipFile);
-					remove((distFile + "tempb").c_str());
-					remove((phylipFile + "tempPhylipB").c_str());	
-				}
-				wait();
-			}
-			else{
-				int pid3 = fork();
-				if(pid3 > 0){
-					driver(distCalculator, seqDB, sqrt(6) * numSeqs / 3, numSeqs, distFile + "tempc", phylipFile + "tempPhylipC", cutoff);	
-					appendFiles(distFile+"tempc", distFile);
-					appendFiles((phylipFile + "tempPhylipC"), phylipFile);
-					remove((distFile + "tempc").c_str());	
-					remove((phylipFile + "tempPhylipC").c_str());					
-				}
-				else{
-					driver(distCalculator, seqDB, (sqrt(3) * numSeqs / 2), numSeqs, distFile + "tempd", phylipFile + "tempPhylipD", cutoff);	
-					appendFiles(distFile+"tempd", distFile);
-					appendFiles((phylipFile + "tempPhylipD"), phylipFile);
-					remove((distFile + "tempd").c_str());	
-					remove((phylipFile + "tempPhylipD").c_str());				
-				}
-				wait();
+			//append and remove temp files
+			for (; it != processIDS.end(); it++) {
+				appendFiles((outputFile + toString(it->second) + ".temp"), outputFile);
+				remove((outputFile + toString(it->second) + ".temp").c_str());
 			}
-			wait();
 		}
-		wait();
-		
 #else
-		driver(distCalculator, seqDB, 0, numSeqs, distFile, phylipFile + "tempPhylipA", cutoff);
-		appendFiles((phylipFile + "tempPhylipA"), phylipFile);	
-		remove((phylipFile + "tempPhylipA").c_str());
+		ifstream inFASTA;
+		driver(0, numSeqs, outputFile, cutoff);
 #endif
 		
 		delete distCalculator;
@@ -311,36 +214,70 @@ int DistanceCommand::execute(){
 		exit(1);
 	}	
 }
+/**************************************************************************************************/
+void DistanceCommand::createProcesses(string filename) {
+	try {
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+		int process = 0;
+		processIDS.clear();
+		
+		//loop through and create all the processes you want
+		while (process != processors) {
+			int pid = fork();
+			
+			if (pid > 0) {
+				processIDS[lines[process]->end] = pid;  //create map from line number to pid so you can append files in correct order later
+				process++;
+			}else if (pid == 0){
+				driver(lines[process]->start, lines[process]->end, filename + toString(getpid()) + ".temp", cutoff);
+				exit(0);
+			}else { cout << "unable to spawn the necessary processes." << endl; exit(0); }
+		}
+	
+		//force parent to wait until all the processes are done
+		for (map<int, int>::iterator it = processIDS.begin(); it != processIDS.end(); it++) { 
+			int temp = it->second;
+			wait(&temp);
+		}
+#endif
+	}
+	catch(exception& e) {
+		cout << "Standard Error: " << e.what() << " has occurred in the DistanceCommand class Function createProcesses. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+		exit(1);
+	}
+	catch(...) {
+		cout << "An unknown error has occurred in the DistanceCommand class function createProcesses. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+		exit(1);
+	}	
+}
 
 /**************************************************************************************************/
 /////// need to fix to work with calcs and sequencedb
-int DistanceCommand::driver(Dist* distCalculator, SequenceDB* align, int startLine, int endLine, string dFileName, string pFilename, float cutoff){
+int DistanceCommand::driver(int startLine, int endLine, string dFileName, float cutoff){
 	try {
+
 		int startTime = time(NULL);
 		
 		//column file
-		ofstream distFile(dFileName.c_str(), ios::trunc);
-		distFile.setf(ios::fixed, ios::showpoint);
-		distFile << setprecision(4);
-		
-		//column file
-		ofstream philFile(pFilename.c_str(), ios::trunc);
-		philFile.setf(ios::fixed, ios::showpoint);
-		philFile << setprecision(4);
+		ofstream outFile(dFileName.c_str(), ios::trunc);
+		outFile.setf(ios::fixed, ios::showpoint);
+		outFile << setprecision(4);
 		
+		if(isTrue(phylip) && startLine == 0){	outFile << alignDB.getNumSeqs() << endl;	}
 		for(int i=startLine;i<endLine;i++){
-			
+			if(isTrue(phylip))	{	outFile << alignDB.get(i).getName() << '\t';	}
 			for(int j=0;j<i;j++){
-				distCalculator->calcDist(*(align->get(i)), *(align->get(j)));
+				distCalculator->calcDist(alignDB.get(i), alignDB.get(j));
 				double dist = distCalculator->getDist();
 				
 				if(dist <= cutoff){
-					distFile << align->get(i)->getName() << ' ' << align->get(j)->getName() << ' ' << dist << endl;
+					if (!isTrue(phylip)) { outFile << alignDB.get(i).getName() << ' ' << alignDB.get(j).getName() << ' ' << dist << endl; }
 				}
-				philFile << dist << '\t';
+				if (isTrue(phylip)) {  outFile << dist << '\t'; }
+				
 			}
 			
-			philFile << endl;
+			if (isTrue(phylip) == true) { outFile << endl; }
 			
 			if(i % 100 == 0){
 				cout << i << '\t' << time(NULL) - startTime << endl;
@@ -349,8 +286,7 @@ int DistanceCommand::driver(Dist* distCalculator, SequenceDB* align, int startLi
 		}
 		cout << endLine-1 << '\t' << time(NULL) - startTime << endl;
 		
-		//philFile.close();
-		//distFile.close();
+		outFile.close();
 		
 		return 1;
 	}
@@ -370,21 +306,15 @@ void DistanceCommand::appendFiles(string temp, string filename) {
 	try{
 		ofstream output;
 		ifstream input;
-		
+	
 		//open output file in append mode
 		openOutputFileAppend(filename, output);
-		
-		//open temp file for reading
 		openInputFile(temp, input);
 		
-		string line;
-		//read input file and write to output file
-		while(input.eof() != true) {
-			getline(input, line); //getline removes the newline char
-			if (line != "") {
-				output << line << endl;   // Appending back newline char 
-			}
-		}	
+		while(char c = input.get()){
+			if(input.eof())		{	break;			}
+			else				{	output << c;	}
+		}
 		
 		input.close();
 		output.close();
@@ -398,4 +328,4 @@ void DistanceCommand::appendFiles(string temp, string filename) {
 		exit(1);
 	}	
 }
-/**************************************************************************************************/
\ No newline at end of file
+/**************************************************************************************************/