Merge branch 'santi3'

Incorporate GB's improvements to the `mutationalrobustness` post-treatment.

src/post_treatments/Makefile.am

@@ -40,8 +40,8 @@ aevol_misc_create_eps \
 aevol_misc_extract \
 aevol_misc_lineage \
 aevol_misc_mutagenesis \
-aevol_misc_mutational_robustness
-# aevol_misc_fixed_mutations
+aevol_misc_mutational_robustness \
+aevol_misc_fixed_mutations
 # aevol_misc_gene_families
 # aevol_misc_robustness
 # aevol_misc_transform_plasmid
@@ -56,7 +56,7 @@ CLEANFILES = $(bin_PROGRAMS)
 aevol_misc_ancstats_SOURCES = ancstats.cpp
 aevol_misc_create_eps_SOURCES = create_eps.cpp
 aevol_misc_extract_SOURCES = extract.cpp
-# aevol_misc_fixed_mutations_SOURCES = fixed_mutations.cpp
+aevol_misc_fixed_mutations_SOURCES = fixed_mutations.cpp
 # aevol_misc_gene_families_SOURCES = gene_families.cpp
 aevol_misc_lineage_SOURCES = lineage.cpp
 aevol_misc_mutagenesis_SOURCES = mutagenesis.cpp

src/post_treatments/mutationalrobustness.cpp

@@ -334,8 +334,10 @@ Usage: %s [-h] -i input_file_name -o output_file_name [-b start_at_generation] [
 \t-e end_at_generation: last generation of the lineage to be analyzed (default: last generation stored in the input file)\n\
 \t-p period: temporal resolution of the analyze (default: 1)\n\
 \t-n nb_mutants : generate and analyse nb_mutants per individual (default: 1000)\n\
-Example:\n\t%s -i lineage_file -o toto.out -b 4000 -e 5000 -p 10 -n 100000 -s 19769\n",prog_name,prog_name,prog_name);
-// \t-r: raw output; store the difference of metabolic error for each mutant generated (warning: the output file may quickly grow)\n\
-// \t-h bin_size: store the histogram with a bin_size resolution. One output file is generated for each histogram (postfixed with the generation number)\n\
-// \t-s mutation_seed: specify the seed to be used for the mutation random generator\n\n\
+Example:\n\t%s -i lineage_file -o toto.out -b 4000 -e 5000 -p 10 -n 100000 -s 19769\n", prog_name, prog_name, prog_name);
+
+// \t-r: raw output; store the difference of metabolic error for each mutant generated (warning: the output file may quickly grow)\n
+// \t-h bin_size: store the histogram with a bin_size resolution. One output file is generated for each histogram (postfixed with the generation number)\n
+// \t-s mutation_seed: specify the seed to be used for the mutation random generator\n\n
+
 }