Merge 00bf903 into 54cc6fe

.travis.yml

@@ -2,22 +2,31 @@ language: julia
 os:
   - linux
   - osx
+  - windows
+
 julia:
   - 1.0
-  - 1.3
-  - 1.4
+  - 1
   - nightly
+
+arch:
+  - x64
+  - x86
+
 notifications:
   email: false
 # Work around a Travis bug
+
 git:
   depth: 999999
 # Uncomment the following lines to override the default test script
 #script:
 #  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
 #  - julia -e 'Pkg.clone(pwd()); Pkg.build("StatsBase"); Pkg.test("StatsBase"; coverage=true)'
+
 after_success:
   - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())';
+
 jobs:
   include:
     - stage: "Documentation"

Project.toml

@@ -15,16 +15,17 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
 [compat]
-julia = "1"
 DataAPI = "1"
 DataStructures = "0.10, 0.11, 0.12, 0.13, 0.14, 0.17"
 Missings = "0.3, 0.4"
 SortingAlgorithms = "0.3"
+julia = "1"
 
 [extras]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
+StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Dates", "DelimitedFiles", "Test"]
+test = ["Dates", "DelimitedFiles", "StableRNGs", "Test"]

README.md

@@ -4,7 +4,6 @@
 
 - **Build & Testing Status:**
   [![Build Status](https://travis-ci.org/JuliaStats/StatsBase.jl.svg?branch=master)](https://travis-ci.org/JuliaStats/StatsBase.jl)
-  [![Build status](https://ci.appveyor.com/api/projects/status/fsut3j3onulvws1w?svg=true)](https://ci.appveyor.com/project/nalimilan/statsbase-jl)
   [![Coverage Status](https://coveralls.io/repos/JuliaStats/StatsBase.jl/badge.svg?branch=master)](https://coveralls.io/r/JuliaStats/StatsBase.jl?branch=master)
   [![Coverage Status](http://codecov.io/github/JuliaStats/StatsBase.jl/coverage.svg?branch=master)](http://codecov.io/github/JuliaStats/StatsBase.jl?branch=master)
 

test/sampling.jl

@@ -1,5 +1,5 @@
 using StatsBase
-using Test, Random
+using Test, Random, StableRNGs
 
 Random.seed!(1234)
 
@@ -78,12 +78,12 @@ test_rng_use(sample, 1:10, 10)
 
 @testset "sampling pairs" begin
 
-    rng = Random.MersenneTwister(1)
+    rng = StableRNG(1)
 
-    @test samplepair(rng, 2)  ===  (1, 2)
-    @test samplepair(rng, 10) === (8, 2)
+    @test samplepair(rng, 2)  ===  (2, 1)
+    @test samplepair(rng, 10) === (5, 6)
 
-    @test samplepair(rng, [3, 4, 2, 6, 8]) === (2, 6)
+    @test samplepair(rng, [3, 4, 2, 6, 8]) === (3, 8)
     @test samplepair(rng, [1, 2])          === (1, 2)
 end
 

test/wsampling.jl

@@ -32,7 +32,7 @@ end
 
 import StatsBase: direct_sample!, alias_sample!
 
-n = 10^5
+n = 10^6
 wv = weights([0.2, 0.8, 0.4, 0.6])
 
 a = direct_sample!(4:7, wv, zeros(Int, n, 3))