Commit 458f723b authored by Philippe Veber's avatar Philippe Veber
Browse files

avoid first-class file_dumps

parent 5598b501
......@@ -90,7 +90,7 @@ let bppseqgen_multi_profiles_script ~config ~out ~profile_c ~seed =
|}
let bppseqgen_multi_profiles ?(descr="") ~profile_f ~profile_c ~nb_sites ~tree ~config ~ne_c ~ne_a ~seed : bppseqgen_multi_profiles directory workflow =
let bppseqgen_multi_profiles ?(descr="") ~profile_f ~profile_c ~nb_sites ~tree ~config ~ne_c ~ne_a ~nodes ~seed : bppseqgen_multi_profiles directory workflow =
let nb_sites_per_profile = 1 in
(* let nb_combis = Pervasives.(nb_sites / nb_sites_per_profile) in *)
let config_f = dest // "config.bpp" in
......@@ -107,7 +107,10 @@ let bppseqgen_multi_profiles ?(descr="") ~profile_f ~profile_c ~nb_sites ~tree ~
opt "-n" int nb_sites;
dep profile_c
];*)
cmd "cat" ~stdout:config_f [(file_dump (conf_file_bppseqgen_multi_profiles ~tree ~profile_f ~config ~ne_c ~ne_a ~nb_sites_per_profile))];
cmd "cat" ~stdout:config_f [
file_dump (conf_file_bppseqgen_multi_profiles ~tree ~profile_f ~config ~ne_c ~ne_a ~nb_sites_per_profile) ;
dep nodes ;
];
cmd "bash" [(file_dump (bppseqgen_multi_profiles_script ~config:config_f ~out ~profile_c:profile_c_ok ~seed))];
]
)
......
......@@ -20,6 +20,7 @@ val bppseqgen_multi_profiles :
config:Bistro.Template.t list ->
ne_c: float ->
ne_a: float ->
nodes:text_file workflow ->
seed:int ->
bppseqgen_multi_profiles directory workflow
......
......@@ -90,9 +90,7 @@ let bpp_config_of_model m = match m with
| HaPC _ -> bpp_config_HaPC_F_Ne
| HaPCOC _ -> bpp_config_HaPCOC_F_Ne
let bpp_config_F nodes m = [
let bpp_config_F m = [
string bpp_config_base ;
insert nodes ;
bpp_config_of_model m
;
bpp_config_of_model m ;
]
......@@ -62,7 +62,7 @@ let derive_from_model ~model ~input_tree ~tree_dataset ~tree_prefix ~profile ~pr
let fna = Bppsuite.bppseqgen ~descr ~nb_sites ~tree ~config in
*)
(* with several profiles or couples of profiles *)
let config_p = Convergence_hypothesis.bpp_config_F nodes model in
let config_p = Convergence_hypothesis.bpp_config_F model in
let ne_g = neg_of_model model in
let ne_c = nec_of_model model in
let ne_a = ne_g in
......@@ -70,7 +70,7 @@ let derive_from_model ~model ~input_tree ~tree_dataset ~tree_prefix ~profile ~pr
let profile_c = profile.profile_c in
(*let seed = Random.int Int.max_value in*)
let seed = calc_fixed_seed ~str:descr seed in
let run_fna = Bppsuite.bppseqgen_multi_profiles ~descr ~nb_sites ~tree ~config:config_p ~profile_f ~profile_c ~ne_c ~ne_a ~seed in
let run_fna = Bppsuite.bppseqgen_multi_profiles ~descr ~nb_sites ~tree ~nodes ~config:config_p ~profile_f ~profile_c ~ne_c ~ne_a ~seed in
let fna = Bppsuite.bppseqgen_multi_profiles_get_fa run_fna in
let fna_infos = Some (Bppsuite.bppseqgen_multi_profiles_get_info run_fna) in
......
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