Skip to content

Reshape can accept : to signal an implicit dimension #4263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Reshape can accept : to signal an implicit dimension #4263

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
747cbdc
Reshape can accept : in place of a dimension to signal that dimension…
malmaud Sep 12, 2013
6a11e9e
'reshape' varargs form bypasses implicit dimension if no colons prese…
malmaud Sep 12, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions base/abstractarray.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,34 @@ function reshape(a::AbstractArray, dims::Dims)
end
copy!(similar(a, dims), a)
end

function reshape(A::AbstractArray, dims::(Union(Int, Colon)...))
new_dims = Array(Int, length(dims))
dim_product = 1.
missing_dim_idx = -1
colon = Colon()
for i = 1:length(dims)
if dims[i] != colon
new_dims[i] = dims[i]
dim_product *= dims[i]
else
if missing_dim_idx == -1
missing_dim_idx = i
else
error("reshape: only one implicit dimension allowed")
end
end
end
missing_dim_value, remainder = divrem(length(A), dim_product)
if remainder != 0
error("reshape: invalid dimensions")
end
new_dims[missing_dim_idx] = missing_dim_value
reshape(A, new_dims...)
end

reshape(a::AbstractArray, dims::Int...) = reshape(a, dims)
reshape(a::AbstractArray, dims::Union(Int, Colon)...) = reshape(a, dims)

vec(a::AbstractArray) = reshape(a,length(a))
vec(a::AbstractVector) = a
Expand Down