From 1debda49e660ef19c98e69ae66ae3b33e07bf7fa Mon Sep 17 00:00:00 2001
From: Tim Holy <tim.holy@gmail.com>
Date: Thu, 4 Aug 2016 07:30:18 -0500
Subject: [PATCH] Get (c)transpose for vectors working with non-1 indices

It was already working for matrices

(cherry picked from commit 9114ae6030e14847e8557eaf11ca6d985743ccee)
ref #17816
---
 base/abstractarray.jl |  7 +++++++
 base/arraymath.jl     |  4 ++--
 test/offsetarray.jl   | 17 ++++++++++++++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/base/abstractarray.jl b/base/abstractarray.jl
index 7a6ead53c946a..dd58280e1de5f 100644
--- a/base/abstractarray.jl
+++ b/base/abstractarray.jl
@@ -625,6 +625,13 @@ convert{T,S,N}(::Type{AbstractArray{T  }}, A::AbstractArray{S,N}) = convert(Abst
 
 convert{T,N}(::Type{Array}, A::AbstractArray{T,N}) = convert(Array{T,N}, A)
 
+"""
+   of_indices(x, y)
+
+Represents the array `y` as an array having the same indices type as `x`.
+"""
+of_indices(x, y) = similar(dims->y, oftype(indices(x), indices(y)))
+
 full(x::AbstractArray) = x
 
 map(::Type{Integer},  a::Array) = map!(Integer, similar(a,typeof(Integer(one(eltype(a))))), a)
diff --git a/base/arraymath.jl b/base/arraymath.jl
index 6d3a2d9770413..60b78f0a2fed3 100644
--- a/base/arraymath.jl
+++ b/base/arraymath.jl
@@ -411,8 +411,8 @@ function ctranspose(A::AbstractMatrix)
 end
 ctranspose{T<:Real}(A::AbstractVecOrMat{T}) = transpose(A)
 
-transpose(x::AbstractVector) = [ transpose(v) for i=1:1, v in x ]
-ctranspose{T}(x::AbstractVector{T}) = T[ ctranspose(v) for i=1:1, v in x ]
+transpose(x::AbstractVector) = [ transpose(v) for i=of_indices(x, OneTo(1)), v in x ]
+ctranspose{T}(x::AbstractVector{T}) = T[ ctranspose(v) for i=of_indices(x, OneTo(1)), v in x ]
 
 _cumsum_type{T<:Number}(v::AbstractArray{T}) = typeof(+zero(T))
 _cumsum_type(v) = typeof(v[1]+v[1])
diff --git a/test/offsetarray.jl b/test/offsetarray.jl
index 2f26454826c7a..d7ebf5a66fd6e 100644
--- a/test/offsetarray.jl
+++ b/test/offsetarray.jl
@@ -101,6 +101,12 @@ using OAs
 
 let
 # Basics
+v0 = rand(4)
+v = OffsetArray(v0, (-3,))
+@test indices(v) == (-2:1,)
+@test_throws ErrorException size(v)
+@test_throws ErrorException size(v, 1)
+
 A0 = [1 3; 2 4]
 A = OffsetArray(A0, (-1,2))                   # LinearFast
 S = OffsetArray(view(A0, 1:2, 1:2), (-1,2))   # LinearSlow
@@ -179,6 +185,10 @@ end
 
 # show
 io = IOBuffer()
+show(io, v)
+str = takebuf_string(io)
+show(io, v0)
+@test str == takebuf_string(io)
 show(io, A)
 str = takebuf_string(io)
 @test str == "[1 3; 2 4]"
@@ -261,7 +271,7 @@ v = view(A0, 1:1, i1)
 # logical indexing
 @test A[A .> 2] == [3,4]
 
-# copy!
+# copy! and fill!
 a = OffsetArray{Int}((-3:-1,))
 fill!(a, -1)
 copy!(a, (1,2))   # non-array iterables
@@ -316,6 +326,7 @@ copy!(am, b)
 @test am[1,8] == 2
 @test am[1,9] == -1
 
+# map
 dest = similar(am)
 map!(+, dest, am, am)
 @test dest[1,7] == 2
@@ -326,6 +337,10 @@ am = map(identity, a)
 @test isa(am, OffsetArray)
 @test am == a
 
+# other functions
+v = OffsetArray(v0, (-3,))
+@test parent(v') == v0'
+@test indices(v') === (1:1,-2:1)
 A = OffsetArray(rand(4,4), (-3,5))
 @test maximum(A) == maximum(parent(A))
 @test minimum(A) == minimum(parent(A))