Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
VEBER Philippe
codepi
Commits
0717a7ff
Commit
0717a7ff
authored
Aug 27, 2018
by
Carine Rey
Browse files
add a descr to prepare (to know which input trees are unrooted)
parent
7bbcea03
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
lib/pipeline.ml
lib/pipeline.ml
+2
-2
lib/ready_dataset.ml
lib/ready_dataset.ml
+2
-2
No files found.
lib/pipeline.ml
View file @
0717a7ff
...
...
@@ -37,7 +37,7 @@ let parse_input_data indir =
let
dataset
=
{
Dataset
.
model_prefix
=
tree_prefix
;
is_real
=
true
;
tree_prefix
=
dataset_prefix
;
dataset
=
Ready_dataset
.
of_raw
raw_dataset
dataset
=
Ready_dataset
.
of_raw
~
descr
:
(
"real_data."
^
tree_prefix
)
raw_dataset
}
in
[
dataset
]
else
...
...
@@ -121,7 +121,7 @@ let derive_from_model ~model ~input_tree ~tree_dataset ~tree_prefix ~profile ~pr
let
derive_from_tree
~
tree_dir
~
tree
~
profile
~
preview
~
use_concat
~
ns
~
no_Ne
~
no_HaPC
~
ne_test
=
let
tree_prefix
=
Filename
.
chop_extension
tree
in
let
input_tree
=
input
(
Filename
.
concat
tree_dir
tree
)
in
let
tree_dataset
=
Tree_dataset
.
prepare
~
descr
:
tree_prefix
input_tree
in
let
tree_dataset
=
Tree_dataset
.
prepare
~
descr
:
(
"simulated_data."
^
tree_prefix
)
input_tree
in
let
models
=
Convergence_hypothesis
.[
[
H0_NeG1
;
...
...
lib/ready_dataset.ml
View file @
0717a7ff
...
...
@@ -14,11 +14,11 @@ type t = {
faa
:
aminoacid_fasta
workflow
;
}
let
of_raw
(
raw_dataset
:
Raw_dataset
.
t
)
=
let
of_raw
?
(
descr
=
""
)
(
raw_dataset
:
Raw_dataset
.
t
)
=
let
input_tree
=
raw_dataset
.
input_tree
in
let
fna
=
raw_dataset
.
fna
in
let
fna_infos
=
raw_dataset
.
fna_infos
in
let
tree_dataset
=
Tree_dataset
.
prepare
input_tree
in
let
tree_dataset
=
Tree_dataset
.
prepare
~
descr
input_tree
in
let
faa
=
Bppsuite
.
fna2faa
~
fna
in
{
input_tree
;
tree_dataset
;
fna
;
faa
;
fna_infos
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment