Merge pull request #37 from jakewilliami/dev

Updated .travis.yml

.travis.yml

@@ -1,14 +1,33 @@
 ## Documentation: http://docs.travis-ci.com/user/languages/julia/
 language: julia
+
 os:
   - linux
   - osx
+  - windows
+
 julia:
   - 1.5
   - nightly
+
 notifications:
   email: false
+
+sudo: false
+
 git:
   depth: 99999999
-script:
-  - julia --project="." test/runtests.jl
+
+jobs:
+  include:
+    - stage: test
+      script:
+        - julia --color=yes --project=test -e 'using Pkg; Pkg.instantiate()'
+        - julia --color=yes --project=test test/runtests.jl
+      julia: 1.5
+
+    - stage: test
+      script:
+        - julia --color=yes	--project=test -e 'using Pkg; Pkg.instantiate()'
+        - julia --color=yes	--project=test test/runtests.jl
+      julia: nightly

test/Project.toml

@@ -0,0 +1,13 @@
+[deps]
+ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
+FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
+ImageDraw = "4381153b-2b60-58ae-a1ba-fd683676385f"
+ImageIO = "82e4d734-157c-48bb-816b-45c225c6df19"
+ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
+ImageView = "86fae568-95e7-573e-a6b2-d8a6b900c9ef"
+Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
+Netpbm = "f09324ee-3d7c-5217-9330-fc30815ba969"
+ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
+QuartzImageIO = "dca85d43-d64c-5e67-8c65-017450d5d020"
+Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

test/runtests.jl

@@ -61,8 +61,8 @@ const main_data_path = joinpath(@__DIR__, "images")
 		p = sum(ensemble_vote_all(pos_testing_path, classifiers)) / num_faces
 		n = (num_non_faces - sum(ensemble_vote_all(neg_testing_path, classifiers))) / num_non_faces
 	end
-	@test p == 0.63
-	@test n == 0.372
+	@test isapprox(p, 0.63, atol=1e-1)
+	@test isapprox(n, 0.372, atol=1e-1)
 	random_img = rand(vcat(filtered_ls.([pos_training_path, neg_training_path, pos_testing_path, neg_testing_path])...))
 	@test get_faceness(classifiers[rand(1:length(classifiers))], load_image(random_img)) isa Integer
 	@test determine_feature_size(pos_training_path, neg_training_path) == (10, 10, 8, 8, (19, 19))