bugfix

rafaqz · Oct 24, 2023 · 24253ff · 24253ff
1 parent 18176cd
commit 24253ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/utils.jl b/src/utils.jl
@@ -27,7 +27,7 @@ true
 """
 function reorder end
 
-reorder(x, A) = reorder(x, dims(A))
+reorder(x, A::Union{AbstractDimArray,AbstractDimStack,AbstractDimIndices}) = reorder(x, dims(A))
 reorder(x, ::Nothing) = throw(ArgumentError("object has no dimensions"))
 reorder(x, p::Pair, ps::Vararg{Pair}) = reorder(x, (p, ps...))
 reorder(x, ps::Tuple{Vararg{Pair}}) = reorder(x, Dimensions.pairdims(ps...))
@@ -43,7 +43,7 @@ reorder(dim::Dimension, ot::Type{<:Order}) =
 _reorder(x, orderdims::DimTuple) = _reorder(reorder(x, orderdims[1]), tail(orderdims))
 _reorder(x, orderdims::Tuple{}) = x
 
-reorder(x, orderdim::Dimension{<:Order}) = _reorder(val(orderdim), x, dims(x, orderdim))
+reorder(x, orderdim::Dimension) = _reorder(val(orderdim), x, dims(x, orderdim))
 reorder(x, orderdim::Dimension{<:LookupArray}) = _reorder(order(orderdim), x, dims(x, orderdim))
 
 _reorder(neworder::Order, x, dim::Dimension) = _reorder(basetypeof(neworder), x, dim)

diff --git a/test/utils.jl b/test/utils.jl
@@ -82,7 +82,12 @@ end
     @test rev != da
     @test reo == da
     @test dims(reo) == dims(da)
-    @test_throws ArgumentError reorder(rev, :test)
+    @test_throws MethodError reorder(rev, :test)
+    rev_s = reverse(s, dims=Y)
+    reo_s = reorder(rev_s, da)
+    @test rev_s != s
+    @test reo_s == s
+    @test dims(reo_s) == dims(s)
 end
 
 @testset "modify" begin