Skip to content

Commit

Permalink
removed experimental EM approach from master branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Arthur ZWAENEPOEL committed May 10, 2019
1 parent f539b69 commit 86ded47
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Whale"
uuid = "aac3ca20-b8cc-11e8-39ce-5b7b76af0ca6"
authors = ["arzwa <[email protected]>"]
version = "0.1.0"
version = "0.2.0"

[deps]
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
Expand Down
3 changes: 2 additions & 1 deletion src/bdp.jl
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ function get_extinction_probabilities(S::SpeciesTree, slices::Slices,
end
end

#=
"""
get_extinction_probabilities(...)
Compute all extinction probabilities, with WGDs. With arbitrary
Expand All @@ -234,7 +235,7 @@ function get_extinction_probabilities(S::SpeciesTree, θ::Array{LinearBDP},
end
end
return ε
end
end =#

"""
get_propagation_probabilities(...)
Expand Down
6 changes: 4 additions & 2 deletions src/types.jl
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ function Base.show(io::IO, ccd::CCD)
write(io, "(clades) based on $(ccd.total) samples")
end

#=
abstract type WhaleEM end
"""
Expand Down Expand Up @@ -164,6 +165,7 @@ mutable struct WhaleMapEM <: WhaleEM
new(S, L, D, T, r, θ, ε, η, N, πλ, πμ)
end
end
=#

"""
BackTracker(S, slices, ri, λ, μ, q, η)
Expand All @@ -180,12 +182,12 @@ struct BackTracker
q::Array{Float64}
η::Float64

function BackTracker(em::WhaleEM)
#=function BackTracker(em::WhaleEM)
λ = [bdp.λ for bdp in em.θ]
μ = [bdp.μ for bdp in em.θ]
q = Float64[]
return BackTracker(em.S, em.L, em.r, λ, μ, q, em.η)
end
end=#

BackTracker(S, slices, ri, ε, ϕ, λ, μ, q, η) = new(
S, slices, ri, ε, ϕ, λ, μ, q, η)
Expand Down

0 comments on commit 86ded47

Please sign in to comment.