Skip to content

Commit

Permalink
Merge pull request #59 from yuyichao/0.6
Browse files Browse the repository at this point in the history
Fix depwarns on 0.6
  • Loading branch information
ararslan authored Feb 13, 2017
2 parents bb25a30 + ea90f19 commit 8af3861
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
julia 0.4
Compat 0.9.2
Compat 0.17.0
4 changes: 2 additions & 2 deletions src/PDMats.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module PDMats
using Compat

import Base: +, *, \, /, ==
import Base: full, logdet, inv, diag, diagm, scale, scale!, eigmax, eigmin, convert
import Base: full, logdet, inv, diag, diagm, eigmax, eigmin, convert

export
# Types
Expand Down Expand Up @@ -43,7 +43,7 @@ module PDMats

# The abstract base type

abstract AbstractPDMat{T<:Real}
@compat abstract type AbstractPDMat{T<:Real} end

# source files

Expand Down
4 changes: 2 additions & 2 deletions src/pdiagmat.jl
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# positive diagonal matrix

immutable PDiagMat{T<:Real,V<:AbstractVector} <: AbstractPDMat{T}
@compat immutable PDiagMat{T<:Real,V<:AbstractVector} <: AbstractPDMat{T}
dim::Int
diag::V
inv_diag::V
PDiagMat(d::Int,v::AbstractVector{T},inv_v::AbstractVector{T}) = new(d,v,inv_v)
(::Type{PDiagMat{T,S}}){T,S}(d::Int,v::AbstractVector{T},inv_v::AbstractVector{T}) = new{T,S}(d,v,inv_v)
end

function PDiagMat(v::AbstractVector,inv_v::AbstractVector)
Expand Down
4 changes: 2 additions & 2 deletions src/pdmat.jl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Full positive definite matrix together with a Cholesky factorization object
immutable PDMat{T<:Real,S<:AbstractMatrix} <: AbstractPDMat{T}
@compat immutable PDMat{T<:Real,S<:AbstractMatrix} <: AbstractPDMat{T}
dim::Int
mat::S
chol::CholType{T,S}
PDMat(d::Int,m::AbstractMatrix{T},c::CholType{T,S}) = new(d,m,c)
(::Type{PDMat{T,S}}){T,S}(d::Int,m::AbstractMatrix{T},c::CholType{T,S}) = new{T,S}(d,m,c)
end

function PDMat(mat::AbstractMatrix,chol::CholType)
Expand Down
4 changes: 2 additions & 2 deletions src/pdsparsemat.jl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Sparse positive definite matrix together with a Cholesky factorization object
immutable PDSparseMat{T<:Real,S<:AbstractSparseMatrix} <: AbstractPDMat{T}
@compat immutable PDSparseMat{T<:Real,S<:AbstractSparseMatrix} <: AbstractPDMat{T}
dim::Int
mat::S
chol::CholTypeSparse
PDSparseMat(d::Int,m::AbstractSparseMatrix{T},c::CholTypeSparse) = new(d,m,c) #add {T} to CholTypeSparse argument once #14076 is implemented
(::Type{PDSparseMat{T,S}}){T,S}(d::Int,m::AbstractSparseMatrix{T},c::CholTypeSparse) = new{T,S}(d,m,c) #add {T} to CholTypeSparse argument once #14076 is implemented
end

function PDSparseMat(mat::AbstractSparseMatrix,chol::CholTypeSparse)
Expand Down

0 comments on commit 8af3861

Please sign in to comment.