diff --git a/Project.toml b/Project.toml index 9e1a3e7..914cbc2 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "ImageTracking" uuid = "7632190a-71f5-11e9-04ef-99e081817785" -version = "0.1.0" +version = "0.2.0" [deps] AxisAlgorithms = "13072b0f-2c55-5437-9ae7-d433b7a33950" diff --git a/src/utility.jl b/src/utility.jl index 5ec09df..85dc3f5 100644 --- a/src/utility.jl +++ b/src/utility.jl @@ -320,7 +320,7 @@ function calculate_statistics(error::Array{Float64, 2}) # AX stats AX_count = Dict() - edges, counts = imhist(error) + edges, counts = build_histogram(error) max_val = maximum(counts) total_pix = length(error) pixel_cumulative_count = cumsum(counts) diff --git a/test/error_evaluation.jl b/test/error_evaluation.jl index 1c5e17e..66c9770 100644 --- a/test/error_evaluation.jl +++ b/test/error_evaluation.jl @@ -1,16 +1,11 @@ -# We output a message after loading each package to work around a -# ten-minute timeout limit on Travis. Travis assumes the tests have hung -# if the interval between printing something to stdio exceeds ten minutes. using Images -@info "Finished loading Images package." using StaticArrays -@info "Finished loading StaticArrays package." @testset "Error Evaluation" begin @info "Running flow evaluation test." img1 = load("../demo/car2.jpg") - img2 = load("../demo/car1.jpg") + img2 = load("../demo/car1.jpg") algorithm = Farneback(50, estimation_window = 11, σ_estimation_window = 9.0, @@ -35,4 +30,4 @@ using StaticArrays @test ep_AX[0.5] < 1e-5 @test ang_RX[0.5] == 0 @test ang_AX[0.5] < 1e-5 -end; +end diff --git a/test/farneback.jl b/test/farneback.jl index 83dc9e0..1986397 100644 --- a/test/farneback.jl +++ b/test/farneback.jl @@ -1,18 +1,9 @@ -# We output a message after loading each package to work around a -# ten-minute timeout limit on Travis. Travis assumes the tests have hung -# if the interval between printing something to stdio exceeds ten minutes. using Images -@info "Finished loading Images package." using TestImages -@info "Finished loading TestImages package." using StaticArrays -@info "Finished loading StaticArrays package." using OffsetArrays -@info "Finished loading OffsetArrays package." using Random -@info "Finished loading Random package." using CoordinateTransformations -@info "Finished loading CoordinateTransformations package." function evaluate_error(dims, flow::Array{SVector{2, Float64}, 2}, Δ, tol) error_count = 0 @@ -164,4 +155,4 @@ end end -end; +end diff --git a/test/visualization.jl b/test/visualization.jl index 8852cfc..c45f66d 100644 --- a/test/visualization.jl +++ b/test/visualization.jl @@ -1,12 +1,5 @@ -# We output a message after loading each package to work around a -# ten-minute timeout limit on Travis. Travis assumes the tests have hung -# if the interval between printing something to stdio exceeds ten minutes. using Images -@info "Finished loading Images package." using StaticArrays -@info "Finished loading StaticArrays package." - - @testset "Visualization" begin @info "Running flow visualization test." @@ -25,4 +18,4 @@ using StaticArrays @test hsv[2] == hsv[4] @test hsv[3] == hsv[5] -end; +end