Commit 9d131075 authored by Plaszczynski Stephane's avatar Plaszczynski Stephane

stupid merge

parent ec1de3fb
...@@ -50,19 +50,13 @@ int main(int argc, char *argv[]) ...@@ -50,19 +50,13 @@ int main(int argc, char *argv[])
std::cout << "output file " + fileName + " already exists: removing it"<<endl; std::cout << "output file " + fileName + " already exists: removing it"<<endl;
remove_file(fileName); remove_file(fileName);
} }
<<<<<<< HEAD
string base=BaseName(fileName); string base=BaseName(fileName);
string ar_file=string("ar_vs_length_")+base; string ar_file=string("ar_vs_length_")+base;
string scale_file=string("scale_")+base; string scale_file=string("scale_")+base;
string cor_file=string("last_step_")+base; string cor_file=string("last_step_")+base;
=======
string ar_file=string("ar_vs_length_")+fileName;
string scale_file=string("scale_")+fileName;
string cor_file=string("last_step_")+fileName;
>>>>>>> 3399f7a40aaa872fc3de1dde13916af714ef0568
cout << "output files:" <<endl; cout << "MCMC output files:" <<endl;
cout << ar_file << " " << scale_file << " " << cor_file << " " << endl; cout << ar_file << " " << scale_file << " " << cor_file << " " << endl;
cout << "output files:" <<endl; cout << "output files:" <<endl;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment