Skip to content

Commit cbda53e

Browse files
authored
bring things up to date (#2)
* bring things up to date * update script * add coverage * drop 0.4 - test 0.5
1 parent b7b4245 commit cbda53e

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

.travis.yml

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
language: julia
2+
23
os:
34
- linux
45
- osx
6+
57
julia:
6-
- 0.4
8+
- 0.5
9+
- 0.6
710
- nightly
11+
812
notifications:
913
email: false
10-
script:
11-
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
12-
- julia --check-bounds=yes -e 'Pkg.clone(pwd()); Pkg.checkout("GeometryTypes"); Pkg.test("Packing"; coverage=true)';
14+
1315
after_success:
14-
- julia -e 'cd(Pkg.dir("Packing")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder()); Codecov.submit(process_folder())'
16+
# push coverage results to Coveralls
17+
- julia -e 'cd(Pkg.dir("Packing")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
18+
# push coverage results to Codecov
19+
- julia -e 'cd(Pkg.dir("Packing")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'

REQUIRE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
julia 0.4
1+
julia 0.5
22
GeometryTypes

src/Packing.jl

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-
VERSION >= v"0.4.0-dev+6521" && __precompile__(true)
2-
1+
__precompile__(true)
32
module Packing
43
using GeometryTypes
54

65
include("rectangle.jl")
76
export RectanglePacker
87

98
end # module
10-
11-
12-
13-
14-

src/rectangle.jl

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
type BinaryNode{T}
22
left::Nullable{T}
33
right::Nullable{T}
4-
BinaryNode() = new(Nullable{T}(), Nullable{T}())
5-
BinaryNode(left::T, right::T) = new(Nullable{T}(a), Nullable{T}(b))
4+
5+
(::Type{BinaryNode{T}}){T}() = new{T}(Nullable{T}(), Nullable{T}())
6+
(::Type{BinaryNode}){T}(left::T, right::T) = new{T}(Nullable{T}(a), Nullable{T}(b))
7+
(::Type{BinaryNode{T}}){T}(left::T, right::T) = new{T}(Nullable{T}(a), Nullable{T}(b))
68
end
79
type RectanglePacker{T}
810
children::BinaryNode{RectanglePacker{T}}
@@ -38,4 +40,3 @@ function Base.push!{T}(node::RectanglePacker{T}, area::SimpleRectangle{T})
3840
return RectanglePacker(SimpleRectangle(rax,ray,raxw-rax,rayh-ray))
3941
end
4042
end
41-

0 commit comments

Comments
 (0)