Merge pull request #14 from lmshk/nthperm

nthperm! argument checking

Author: mschauer

src/permutations.jl

@@ -146,15 +146,15 @@ end
 In-place version of [`nthperm`](@ref); the array `a` is overwritten.
 """
 function nthperm!(a::AbstractVector, k::Integer)
-    k -= 1 # make k 1-indexed
-    k < 0 && throw(ArgumentError("permutation k must be ≥ 0, got $k"))
     n = length(a)
     n == 0 && return a
-    f = factorial(oftype(k, n-1))
+    f = factorial(oftype(k, n))
+    0 < k <= f || throw(ArgumentError("permutation k must satisfy 0 < k ≤ $f, got $k"))
+    k -= 1 # make k 1-indexed
     for i=1:n-1
+        f = div(f, n - i + 1)
         j = div(k, f) + 1
         k = k % f
-        f = div(f, n-i)
 
         j = j+i-1
         elt = a[j]

test/permutations.jl

@@ -38,7 +38,17 @@ end
 #Euler Problem #24
 @test nthperm!([0:9;],1000000) == [2,7,8,3,9,1,5,4,6,0]
 
-@test nthperm([0,1,2],3) == [1,0,2]
+@test_throws ArgumentError nthperm([0, 1, 2], 0)
+@test nthperm([0, 1, 2], 1) == [0, 1, 2]
+@test nthperm([0, 1, 2], 3) == [1, 0, 2]
+@test nthperm([0, 1, 2], 6) == [2, 1, 0]
+@test_throws ArgumentError nthperm([0, 1, 2], 7)
+
+@test_throws ArgumentError nthperm([0:20;], big(0))
+@test nthperm([0:20;], big(1)) == [0:20;]
+@test nthperm([0:20;], factorial(big(20))) == [0; 20:-1:1]
+@test nthperm([0:20;], factorial(big(21))) == [20:-1:0;]
+@test_throws ArgumentError nthperm([0:20;], factorial(big(21)) + 1)
 
 # Immutable AbstractArrays
 @test nthperm(1:5, 1) == [1,2,3,4,5]