Merge pull request #11 from JuliaReinforcementLearning/fix_RL_600

support multi dimensions in the last dim of circular array buffer

Author: findmyway

src/CircularArrayBuffers.jl

@@ -33,7 +33,7 @@ end
 Adapt.adapt_structure(to, cb::CircularArrayBuffer) =
     CircularArrayBuffer(adapt(to, cb.buffer), cb.first, cb.nframes, cb.step_size)
 
-function Base.show(io::IO, ::MIME"text/plain", cb::CircularArrayBuffer{T}) where T
+function Base.show(io::IO, ::MIME"text/plain", cb::CircularArrayBuffer{T}) where {T}
     print(io, ndims(cb) == 1 ? "CircularVectorBuffer(" : "CircularArrayBuffer(")
     Base.showarg(io, cb.buffer, false)
     print(io, ") with eltype $T:\n")
@@ -77,7 +77,7 @@ end
     end
 end
 
-_buffer_frame(cb::CircularArrayBuffer, I::AbstractVector{<:Integer}) = map(i -> _buffer_frame(cb, i), I)
+_buffer_frame(cb::CircularArrayBuffer, I::AbstractArray{<:Integer}) = map(i -> _buffer_frame(cb, i), I)
 
 function Base.empty!(cb::CircularArrayBuffer)
     cb.nframes = 0

test/runtests.jl

@@ -79,6 +79,10 @@ CUDA.allowscalar(false)
         @test size(b) == (3,)
         @test b[[1, 2, 3]] == [7, 8, 9]
 
+        # https://github.com/JuliaReinforcementLearning/ReinforcementLearning.jl/pull/600
+        @test b[[1 3; 2 3]] == [7 9; 8 9]
+        @test @view(b[[1 3; 2 3]]) == [7 9; 8 9]
+
         x = pop!(b)
         @test x == 9
         @test length(b) == 2