stateful iteration

Project.toml

@@ -9,6 +9,7 @@ ElasticArrays = "fdbdab4c-e67f-52f5-8c3f-e7b388dad3d4"
 GeneralizedGenerated = "6b9d7cbe-bcb9-11e9-073f-15a7a543e2eb"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 NestedTuples = "a734d2a7-8d68-409b-9419-626914d4061d"
+Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"

src/hypercube.jl

@@ -1,7 +1,9 @@
 using GeneralizedGenerated
 using NestedTuples
+using Random: AbstractRNG
+using Random
 
-abstract type Hypercube{k} end
+abstract type Hypercube{k} <: AbstractRNG end
 
 
 struct RandHypercube{T} <: Hypercube{Inf}
@@ -12,6 +14,20 @@ function Base.rand(ω::RandHypercube)
     rand(ω.rng)
 end
 
+function Base.rand(ω::Hypercube, ::Type{T}) where {T <: Integer}
+    a = typemin(T)
+    b = typemax(T)
+    p = rand(ω)
+    return convert(T, b*p + a*(1-p))
+end
+
+function Base.rand(ω::Hypercube, ::Type{T}) where {T <: AbstractFloat}
+    convert(T, rand(ω))
+end
+
+function Base.rand(ω::Hypercube, ::Type{T}) where {T <: Complex}
+    convert(T, rand(ω) + rand(ω)im)
+end
 
 # TODO: Add a test
 function NestedTuples.with(m::Module, hcube_nt::NamedTuple{N,Tuple{H}}, tv::TupleVector{T,X}, ex::TypelevelExpr{E}) where {T,X,E, N, H<:Hypercube}

src/optional/Sobol.jl

@@ -7,26 +7,27 @@ export SobolHypercube
 struct SobolHypercube{k} <: Hypercube{k}
     seq :: SobolSeq{k}
     value :: Vector{Float64}
-    index :: Ref{Int}  # start at zero
+    iter :: Iterators.Stateful{Vector{Float64}, Union{Nothing, Tuple{Float64, Int64}}}
 
     function SobolHypercube(k::Int)
         seq = SobolSeq(k)
         value = Sobol.next!(seq)
-        return new{k}(seq, value, 0)
+        return new{k}(seq, value, Iterators.Stateful(value))
     end
 end
 
 export next!
 
-function next!(s::SobolHypercube)
-    s.index[] = 0
-    Sobol.next!(s.seq, s.value)
+function next!(ω::SobolHypercube)
+    Sobol.next!(ω.seq, ω.value)
+    ω.iter.nextvalstate = iterate(ω.value)
+    ω.iter.taken = 0
+    return ω
 end
 
 
-function Base.rand(ω::SobolHypercube{k}) where {k}
-    ω.value[ω.index[] += 1]
-end
+Base.rand(ω::SobolHypercube) = popfirst!(ω.iter)
+
 
 # function makeplot()
 #     ω = SobolHypercube(100)