Skip to content
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

add StructuredArray abstract type #6906

Closed
wants to merge 1 commit into from
Closed

add StructuredArray abstract type #6906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions base/exports.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ export
StridedMatrix,
StridedVecOrMat,
StridedVector,
StructuredArray,
StructuredMatrix,
SubArray,
SubDArray,
SubOrDArray,
Expand Down
6 changes: 6 additions & 0 deletions base/linalg.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ export
BLAS,

# Types
StructuredArray,
StructuredMatrix,
SymTridiagonal,
Tridiagonal,
Bidiagonal,
Expand Down Expand Up @@ -156,6 +158,10 @@ typealias BlasReal Union(Float64,Float32)
typealias BlasComplex Union(Complex128,Complex64)
typealias BlasChar Char

abstract StructuredArray{T,N} <: AbstractArray{T,N}
typealias StructuredMatrix{T} StructuredArray{T,2}


if USE_BLAS64
typealias BlasInt Int64
blas_int(x) = int64(x)
Expand Down
2 changes: 1 addition & 1 deletion base/linalg/bidiag.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Bidiagonal matrices
type Bidiagonal{T} <: AbstractMatrix{T}
type Bidiagonal{T} <: StructuredMatrix{T}
dv::AbstractVector{T} # diagonal
ev::AbstractVector{T} # sub/super diagonal
isupper::Bool # is upper bidiagonal (true) or lower (false)
Expand Down
2 changes: 1 addition & 1 deletion base/linalg/diagonal.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Diagonal matrices

immutable Diagonal{T} <: AbstractMatrix{T}
immutable Diagonal{T} <: StructuredMatrix{T}
diag::Vector{T}
end
Diagonal(A::Matrix) = Diagonal(diag(A))
Expand Down
2 changes: 1 addition & 1 deletion base/linalg/givens.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
immutable Givens{T} <: AbstractMatrix{T}
immutable Givens{T} <: StructuredMatrix{T}
size::Int
i1::Int
i2::Int
Expand Down
4 changes: 2 additions & 2 deletions base/linalg/rectfullpacked.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Rectangular Full Packed Matrices

type SymmetricRFP{T<:BlasFloat} <: AbstractMatrix{T}
type SymmetricRFP{T<:BlasFloat} <: StructuredMatrix{T}
data::Vector{T}
transr::Char
uplo::Char
Expand All @@ -12,7 +12,7 @@ function Ac_mul_A_RFP{T<:BlasFloat}(A::Matrix{T})
SymmetricRFP(C, 'N', 'U')
end

type TriangularRFP{T<:BlasFloat} <: AbstractMatrix{T}
type TriangularRFP{T<:BlasFloat} <: StructuredMatrix{T}
data::Vector{T}
transr::Char
uplo::Char
Expand Down
6 changes: 3 additions & 3 deletions base/linalg/symmetric.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#Symmetric and Hermitian matrices
immutable Symmetric{T} <: AbstractMatrix{T}
immutable Symmetric{T} <: StructuredMatrix{T}
S::Matrix{T}
uplo::Char
end
Symmetric(A::Matrix, uplo::Symbol=:U) = (chksquare(A);Symmetric(A, string(uplo)[1]))
immutable Hermitian{T} <: AbstractMatrix{T}
immutable Hermitian{T} <: StructuredMatrix{T}
S::Matrix{T}
uplo::Char
end
Expand Down Expand Up @@ -65,4 +65,4 @@ function sqrtm{T<:Real}(A::RealHermSymComplexHerm{T})
F = eigfact(A)
isposdef(F) && return F.vectors*Diagonal(sqrt(F.values))*F.vectors'
return F.vectors*Diagonal(sqrt(complex(F.values)))*F.vectors'
end
end
2 changes: 1 addition & 1 deletion base/linalg/triangular.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Triangular
immutable Triangular{T<:Number} <: AbstractMatrix{T}
immutable Triangular{T<:Number} <: StructuredMatrix{T}
UL::Matrix{T}
uplo::Char
unitdiag::Char
Expand Down
4 changes: 2 additions & 2 deletions base/linalg/tridiag.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#### Specialized matrix types ####

## Hermitian tridiagonal matrices
immutable SymTridiagonal{T} <: AbstractMatrix{T}
immutable SymTridiagonal{T} <: StructuredMatrix{T}
dv::Vector{T} # diagonal
ev::Vector{T} # subdiagonal
function SymTridiagonal(dv::Vector{T}, ev::Vector{T})
Expand Down Expand Up @@ -140,7 +140,7 @@ function getindex{T}(A::SymTridiagonal{T}, i::Integer, j::Integer)
end

## Tridiagonal matrices ##
immutable Tridiagonal{T} <: AbstractMatrix{T}
immutable Tridiagonal{T} <: StructuredMatrix{T}
dl::Vector{T} # sub-diagonal
d::Vector{T} # diagonal
du::Vector{T} # sup-diagonal
Expand Down