Skip to content

Commit

Permalink
Require Julia 0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
jangevaare committed Oct 12, 2017
1 parent 00a9eab commit f622c41
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ os:
- linux
- osx
julia:
- 0.5
- 0.6
- nightly
notifications:
email: false
Expand Down
2 changes: 1 addition & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
julia 0.5
julia 0.6
RecipesBase
6 changes: 2 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
environment:
matrix:
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"

branches:
only:
Expand Down
8 changes: 4 additions & 4 deletions src/structure.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""
A parametric node of phylogenetic tree
"""
type Node
struct Node
in::Vector{Int64}
out::Vector{Int64}

Expand All @@ -14,14 +14,14 @@ end
"""
A directed parametric branch connecting two nodes of phylogenetic tree
"""
type Branch
struct Branch
source::Int64
target::Int64
length::Float64

function Branch(source::Int64, target::Int64, length::Float64)
if length < 0.
error("Branch length must be positive")
error("Branch length is < 0.0")
end
new(source, target, length)
end
Expand All @@ -35,7 +35,7 @@ end
"""
Parametric phylogenetic tree object
"""
type Tree
struct Tree
nodes::Dict{Int64, Node}
branches::Dict{Int64, Branch}
height::Float64
Expand Down

0 comments on commit f622c41

Please sign in to comment.