Change the logs

BenoitMorel · Oct 5, 2023 · 9049191 · 9049191
1 parent 5e5ba0d
commit 9049191
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/ale/AleArguments.cpp b/src/ale/AleArguments.cpp
@@ -37,7 +37,7 @@ AleArguments::AleArguments(int iargc, char * iargv[]):
   maxCladeSplitRatio(DEFAULT_MAX_SPLIT_RATIO),
   sampleFrequency(1),
   geneTreeSamples(DEFAULT_GENE_TREE_SAMPLES),
-  output("GeneTegrator"),
+  output("alerax_output"),
   cleanupCCP(true),
   seed(123),
   randomSpeciesRoot(false),

diff --git a/src/ale/AleArguments.hpp b/src/ale/AleArguments.hpp
@@ -33,8 +33,8 @@ class AleArguments {
   std::string fractionMissingFile;
   std::string speciesCategoryFile;
   bool perFamilyRates;
-  bool memorySavings;
   bool perSpeciesRates;
+  bool memorySavings;
   double d;
   double l;
   double t;

diff --git a/src/ale/ale.cpp b/src/ale/ale.cpp
@@ -13,6 +13,8 @@
 #include <routines/SlavesMain.hpp>
 #include <IO/HighwayCandidateParser.hpp>
 
+const char *version = "AleRax v1.0.0";
+
 void filterInvalidFamilies(Families &families)
 {
   Logger::timed << "Filtering families" << std::endl;
@@ -218,6 +220,11 @@ void run( AleArguments &args)
   std::string ccpDir = FileSystem::joinPaths(args.output, "ccps");
   FileSystem::mkdir(ccpDir, true);
   Logger::initFileOutput(FileSystem::joinPaths(args.output, "alerax"));
+
+  Logger::timed << version << std::endl; 
+  args.printCommand();
+  args.printSummary();
+
   auto families = FamiliesFileParser::parseFamiliesFile(args.families);
   if (!args.skipFamilyFiltering) {
     filterInvalidFamilies(families);
@@ -354,10 +361,8 @@ int genetegrator_main(int argc, char** argv, void* comm)
 {
   ParallelContext::init(comm); 
   Logger::init();
-  Logger::timed << "AleRax v1.0.0" << std::endl; 
+  Logger::timed << version << std::endl; 
   AleArguments args(argc, argv); 
-  args.printCommand();
-  args.printSummary();
   args.checkValid();
   run(args);
   Logger::close();