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
e594f2a8
Commit
e594f2a8
authored
Nov 17, 2020
by
Philippe Veber
Browse files
removed buggy version of multinomial
parent
27217276
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
22 deletions
+0
-22
lib/detection_pipeline.ml
lib/detection_pipeline.ml
+0
-7
lib/detection_pipeline.mli
lib/detection_pipeline.mli
+0
-2
lib/multinomial.ml
lib/multinomial.ml
+0
-12
lib/pipeline.ml
lib/pipeline.ml
+0
-1
No files found.
lib/detection_pipeline.ml
View file @
e594f2a8
...
...
@@ -31,8 +31,6 @@ module type S = sig
val
topological
:
query
->
cpt
file
val
multinomial
:
query
->
cpt
file
val
multinomial_simulation_lrt
:
query
->
cpt
file
val
multinomial_simulation_sparse
:
query
->
cpt
file
...
...
@@ -121,11 +119,6 @@ module Make (Q : Query) = struct
Topological
.
topological
~
faa
~
tree
~
tree_conv
~
prot_model
:
"LG08"
()
|>
Topological
.
results
let
multinomial
d
=
Multinomial
.
multinomial
~
tree_sc
:
(
tree
~
branch_length_unit
:
`Amino_acid
d
)
~
faa
:
(
amino_acid_alignment
d
)
()
let
multinomial_asymptotic_lrt
d
=
Multinomial
.
multinomial_asymptotic_lrt
~
tree_sc
:
(
tree
~
branch_length_unit
:
`Amino_acid
d
)
...
...
lib/detection_pipeline.mli
View file @
e594f2a8
...
...
@@ -31,8 +31,6 @@ module type S = sig
val
topological
:
query
->
cpt
file
val
multinomial
:
query
->
cpt
file
val
multinomial_simulation_lrt
:
query
->
cpt
file
val
multinomial_simulation_sparse
:
query
->
cpt
file
...
...
lib/multinomial.ml
View file @
e594f2a8
open
Core
open
Bistro
open
Bistro
.
Shell_dsl
open
File_formats
let
multinomial
?
(
descr
=
""
)
~
(
tree_sc
:_
file
)
~
(
faa
:
aminoacid_fasta
file
)
()
:
cpt
file
=
let
img
=
Env
.
env_py
in
Workflow
.
shell
~
descr
:
(
"calc_multinomial."
^
descr
)
~
img
[
cmd
"python"
[
file_dump
(
string
Scripts
.
calc_multinomial
)
;
opt
"-t"
dep
tree_sc
;
opt
"-a"
dep
faa
;
opt
"-o"
ident
dest
;
]
]
let
%
pworkflow
multinomial_ocaml_implementation
~
meth
~
(
tree_sc
:_
file
)
~
(
faa
:
aminoacid_fasta
file
)
(* : cpt file *)
=
let
open
Phylogenetics
in
let
open
Phylogenetics_convergence
in
...
...
lib/pipeline.ml
View file @
e594f2a8
...
...
@@ -218,7 +218,6 @@ let derive_from_det_meth ~det_meth ~(dataset : Dataset.t) ~preview =
|
`Identical_WAG
->
`Identical_WAG
(
Identical
.
identical
~
descr
~
faa
~
tree_id
~
tree_sc
~
prot_model
:
"WAG01"
()
)
|
`Topological_LG
->
`Topological_LG
(
Topological
.
topological
~
descr
~
faa
~
tree
:
tree_id
~
tree_conv
~
prot_model
:
"LG08"
()
)
|
`Topological_WAG
->
`Topological_WAG
(
Topological
.
topological
~
descr
~
faa
~
tree
:
tree_id
~
tree_conv
~
prot_model
:
"WAG01"
()
)
|
`Multinomial
->
`Multinomial
(
Multinomial
.
multinomial
~
descr
~
faa
~
tree_sc
()
)
|
`Msd
e
->
`Msd
(
Msd
.
msd
~
descr
~
e
~
faa
~
tree_sc
,
e
)
...
...
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