Skip to content

Commit f171b26

Browse files
authored
Merge pull request #35 from JuliaImages/tag_release
Bumps release
2 parents 02464cc + 3878b75 commit f171b26

5 files changed

Lines changed: 6 additions & 27 deletions

File tree

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "ImageTracking"
22
uuid = "7632190a-71f5-11e9-04ef-99e081817785"
3-
version = "0.1.0"
3+
version = "0.2.0"
44

55
[deps]
66
AxisAlgorithms = "13072b0f-2c55-5437-9ae7-d433b7a33950"

src/utility.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ function calculate_statistics(error::Array{Float64, 2})
320320

321321
# AX stats
322322
AX_count = Dict()
323-
edges, counts = imhist(error)
323+
edges, counts = build_histogram(error)
324324
max_val = maximum(counts)
325325
total_pix = length(error)
326326
pixel_cumulative_count = cumsum(counts)

test/error_evaluation.jl

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
# We output a message after loading each package to work around a
2-
# ten-minute timeout limit on Travis. Travis assumes the tests have hung
3-
# if the interval between printing something to stdio exceeds ten minutes.
41
using Images
5-
@info "Finished loading Images package."
62
using StaticArrays
7-
@info "Finished loading StaticArrays package."
83

94
@testset "Error Evaluation" begin
105
@info "Running flow evaluation test."
116

127
img1 = load("../demo/car2.jpg")
13-
img2 = load("../demo/car1.jpg")
8+
img2 = load("../demo/car1.jpg")
149

1510
algorithm = Farneback(50, estimation_window = 11,
1611
σ_estimation_window = 9.0,
@@ -35,4 +30,4 @@ using StaticArrays
3530
@test ep_AX[0.5] < 1e-5
3631
@test ang_RX[0.5] == 0
3732
@test ang_AX[0.5] < 1e-5
38-
end;
33+
end

test/farneback.jl

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1-
# We output a message after loading each package to work around a
2-
# ten-minute timeout limit on Travis. Travis assumes the tests have hung
3-
# if the interval between printing something to stdio exceeds ten minutes.
41
using Images
5-
@info "Finished loading Images package."
62
using TestImages
7-
@info "Finished loading TestImages package."
83
using StaticArrays
9-
@info "Finished loading StaticArrays package."
104
using OffsetArrays
11-
@info "Finished loading OffsetArrays package."
125
using Random
13-
@info "Finished loading Random package."
146
using CoordinateTransformations
15-
@info "Finished loading CoordinateTransformations package."
167

178
function evaluate_error(dims, flow::Array{SVector{2, Float64}, 2}, Δ, tol)
189
error_count = 0
@@ -164,4 +155,4 @@ end
164155

165156
end
166157

167-
end;
158+
end

test/visualization.jl

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
1-
# We output a message after loading each package to work around a
2-
# ten-minute timeout limit on Travis. Travis assumes the tests have hung
3-
# if the interval between printing something to stdio exceeds ten minutes.
41
using Images
5-
@info "Finished loading Images package."
62
using StaticArrays
7-
@info "Finished loading StaticArrays package."
8-
9-
103

114
@testset "Visualization" begin
125
@info "Running flow visualization test."
@@ -25,4 +18,4 @@ using StaticArrays
2518
@test hsv[2] == hsv[4]
2619
@test hsv[3] == hsv[5]
2720

28-
end;
21+
end

0 commit comments

Comments
 (0)