Commit 88eb2f70 authored by Carine Rey's avatar Carine Rey Committed by Philippe Veber
Browse files

rm plot

parent 8d3f4472
......@@ -166,7 +166,7 @@ let repo_of_dataset_results_l ~dataset_results_l =
)
|> List.concat
let repo_of_real_dataset_results_l ~dataset_results_l =
let repo_of_real_dataset_results_l ~dataset_results_l ?(plot = false) () =
List.map dataset_results_l ~f:(fun dataset_results ->
let det_results_l = dataset_results.res_by_tools in
let merged_results = dataset_results.merged_results in
......@@ -174,9 +174,15 @@ let repo_of_real_dataset_results_l ~dataset_results_l =
let model_prefix = dataset_results.model_prefix in
let tree_prefix = dataset_results.tree_prefix in
let merged_results_item = Repo.item [tree_prefix ^"."^model_prefix^".merged_results.tsv"] merged_results in
let plot_merged_results_item = Repo.item [tree_prefix ^"."^model_prefix^".plot_merged_results.svg"] plot_merge_results in
let plot_merged_results_item =
if plot then
[Repo.item [tree_prefix ^"."^model_prefix^".plot_merged_results.svg"] plot_merge_results]
else
[]
in
List.concat [
[merged_results_item ;
List.concat [
[merged_results_item] ;
plot_merged_results_item ;
]|> Repo.shift "Merged_Results" ;
List.map det_results_l ~f:repo_of_detection_result
......@@ -339,7 +345,7 @@ let validation_main ~outdir ?(indir = "") ?(ns = 0) ?(np = 2) ?(mem = 2) ~previe
in
let repo_real_trees = [
Dataset.repo dataset_l ;
repo_of_real_dataset_results_l ~dataset_results_l ;
repo_of_real_dataset_results_l ~dataset_results_l ();
] |> List.concat
in
let repo = (Repo.shift "Simulated_datasets" sim_repo_l#repo) @ (Repo.shift "Real_datasets" repo_real_trees) in
......@@ -393,11 +399,13 @@ let realdata_main ~outdir ~indir ~preview ~use_diffsel ~use_c60 ~calc_dnds ?(np
Random.init seed ;
(* real trees *)
printf "Input parsing\n";
let dataset_l = parse_input_data ~seed ~calc_dnds indir in
printf "Convergent evolution detection\n";
let dataset_results_l = derive_det ~dataset_l ~preview ~use_diffsel ~use_c60 in
let repo_real_trees = [
Dataset.repo dataset_l ;
repo_of_real_dataset_results_l ~dataset_results_l ;
repo_of_real_dataset_results_l ~dataset_results_l ();
] |> List.concat (* list of repos *)
in
let repo = Repo.shift "Real_datasets" repo_real_trees 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