Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions src/Utilities/sparse_matrix.jl
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@ _first_index(::Type{T}, ::ZeroBasedIndexing) where {T} = T(0)
_first_index(::Type{T}, ::OneBasedIndexing) where {T} = T(1)

_shift(x, ::T, ::T) where {T<:AbstractIndexing} = x
_shift(x::Integer, ::ZeroBasedIndexing, ::OneBasedIndexing) = x + 1
_shift(x::Integer, ::OneBasedIndexing, ::ZeroBasedIndexing) = x - 1
_shift(x::Array{<:Integer}, ::ZeroBasedIndexing, ::OneBasedIndexing) = x .+ 1
_shift(x::Integer, ::ZeroBasedIndexing, ::OneBasedIndexing) = x + one(typeof(x))
_shift(x::Integer, ::OneBasedIndexing, ::ZeroBasedIndexing) = x - one(typeof(x))
function _shift(x::Array{<:Integer}, ::ZeroBasedIndexing, ::OneBasedIndexing)
return x .+ one(eltype(x))
end

"""
mutable struct MutableSparseMatrixCSC{Tv,Ti<:Integer,I<:AbstractIndexing}
Expand Down
9 changes: 9 additions & 0 deletions test/Utilities/sparse_matrix.jl
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,15 @@ function test_ScalarAffine_OneBased()
return
end

function test_MutableSparseMatrixCSC_convert_to_Cint()
I = MOI.Utilities.ZeroBasedIndexing
A = MOI.Utilities.MutableSparseMatrixCSC{Float32,Int32,I}()
B = convert(SparseArrays.SparseMatrixCSC{Float32,Int32}, A)
@test B isa SparseArrays.SparseMatrixCSC{Float32,Int32}
@test isempty(B)
return
end

end

TestSparseMatrix.runtests()
Loading