fix related issues, add new test

Author: rokke-git

src/sparsematrix.jl

@@ -355,7 +355,6 @@ function Base.show(io::IO, ::MIME"text/plain", S::AbstractSparseMatrixCSCInclAdj
 
     screen = displaysize(io)
     get(io, :limit, false) && screen[1] <= 4 && return print(io, ": …")
-    println(io, ":")
 
     show_circular(io, S) && return
     io = IOContext(io, :compact=>true, :typeinfo=>eltype(S), :SHOWN_SET=>S)
@@ -435,7 +434,7 @@ function _show_with_braille_patterns(io::IO, S::AbstractSparseMatrixCSCInclAdjoi
     # `scaleHeight` and `scaleWidth` accordingly. Note that each available
     # character can contain up to 4 braille dots in its height (⡇) and up to
     # 2 braille dots in its width (⠉).
-    if get(io, :limit, true) && (m > 4maxHeight || n > 2maxWidth)
+    if get(io, :limit, false) && (m > 4maxHeight || n > 2maxWidth)
         s = min(2maxWidth / n, 4maxHeight / m)
         scaleHeight = floor(Int, s * m)
         scaleWidth = floor(Int, s * n)
@@ -468,6 +467,12 @@ function _show_with_braille_patterns(io::IO, S::AbstractSparseMatrixCSCInclAdjoi
     rvals = rowvals(parent(S))
     rowscale = max(1, scaleHeight - 1) / max(1, m - 1)
     colscale = max(1, scaleWidth - 1) / max(1, n - 1)
+
+    if rowscale != 1 || colscale != 1
+        print(io, " (downscaled to fit on screen)")
+    end
+    println(io, ":")
+
     if isa(S, AbstractSparseMatrixCSC)
         @inbounds for j in axes(S,2)
             # Scale the column index `j` to the best matching column index
@@ -516,6 +521,8 @@ function _show_with_dotted_zeros(io::IO, S::AbstractSparseMatrixCSCInclAdjointAn
     colwidths = [max.((0, 0), align[findall(==(col), cols)]...) for col in axes(S,2)]
     displaysize(io)[2] < sum(sum.(colwidths) .+ 2) && return _show_with_braille_patterns(io, S)
 
+    println(io, ":")
+
     try
         zero(eltype(S))
     catch
@@ -531,10 +538,26 @@ function _show_with_dotted_zeros(io::IO, S::AbstractSparseMatrixCSCInclAdjointAn
                 l, r = cld(l+r-1, 2) + 1, div(l+r-1, 2) + 1
                 print(io, " "^l * "⋅" * (col==axes(S,2)[end] ? "" : " "^r))
             else
-                l, r = (l+1, r+1) .- align[index][]
-                print(io, " "^l)
-                isassigned(vals, index[]) ? show(io, vals[index][]) : print(io, "#undef")
-                col == axes(S,2)[end] || print(io, " "^r)
+                try # print the element with 1 space of buffer on each side
+                    l, r = (l+1, r+1) .- align[index][]
+                    print(io, " "^l)
+                    isassigned(vals, index[]) ? show(io, vals[index][]) : print(io, "#undef")
+                    col == axes(S,2)[end] || print(io, " "^r)
+                catch # if there's overlapping entries, [] will error. default to summing
+                      # entries, but print in red to warn user that something's wrong
+                    elm = any(!isassigned(vals, id) for id in index) ? "#undef" :
+                        try repr(sum(vals[index]); context=:compact=>true) catch e "#NaN" end
+
+                    if length(elm) <= l+r # give up on alignment, center item in column
+                        l, r = cld(l+r-length(elm), 2) + 1, div(l+r-length(elm), 2) + 1
+                    else # len of new item does not fit in column
+                        elm = ' ' * "▒"^(l+r) * ' '
+                        l, r = 0, 0
+                    end
+
+                    printstyled(io, " "^l, elm, color=:red)
+                    col == axes(S,2)[end] || print(io, " "^r)
+                end
             end
         end
         row == axes(S,1)[end] || println(io)
@@ -683,7 +706,7 @@ function _sparse_copyto!(dest::AbstractMatrix, src::AbstractSparseMatrixCSC)
     @inbounds for col in axes(src, 2), ptr in nzrange(src, col)
         row = rowvals(src)[ptr]
         val = nonzeros(src)[ptr]
-        dest[isrc[row, col]] = val
+        dest[isrc[row, col]] += val
     end
     return dest
 end

test/issues.jl

@@ -821,6 +821,21 @@ end
     @test eltype(rowvals(zero(v))) <: Int16
 end
 
+@testset "Issue #618" begin
+    x = SparseMatrixCSC(3, 3, [1, 3, 4, 5], [1, 1, 2, 3], [1.0, 1.0, 1.0, 1.0])
+    @test contains(repr(MIME"text/plain"(), x), "2.0")
+    x = SparseMatrixCSC(3, 3, [1, 3, 4, 5], [1, 1, 2, 3], [7.0, 7.0, 1.0, 1.0])
+    @test contains(repr(MIME"text/plain"(), x), "▒▒▒")
+    x = SparseMatrixCSC(3, 3, [1, 3, 4, 5], [1, 1, 2, 3], [7.0, 'o', 1.0, 1.0])
+    @test contains(repr(MIME"text/plain"(), x), "#NaN")
+    v = similar(Any[1, 2, 3, 4]); v[2:4] = [1.0, 1.0, 1.0]
+    x = SparseMatrixCSC(3, 3, [1, 3, 4, 5], [1, 1, 2, 3], v)
+    @test contains(repr(MIME"text/plain"(), x), "#undef")
+
+    x = SparseMatrixCSC(3, 3, [1, 3, 4, 5], [1, 1, 2, 3], [1, 1, 1, 1])
+    @test 2 == Matrix(x)[1,1]
+end
+
 end # SparseTestsBase
 
 end # module

test/sparsematrix_constructors_indexing.jl

@@ -1538,7 +1538,7 @@ end
         show(io, MIME"text/plain"(), transform(A))
         @test String(take!(io)) == showstring
         _show_with_braille_patterns(convert(IOContext, io), transform(A))
-        @test String(take!(io)) == braille
+        @test contains(String(take!(io)), braille)
     end
 
     # every 1-dot braille pattern
@@ -1559,7 +1559,7 @@ end
     for transform in (identity, adjoint, transpose)
         expected = "⎡" * Char(10240)^2 * "⎤\n⎣" * Char(10240)^2 * "⎦"
         _show_with_braille_patterns(convert(IOContext, io), transform(A))
-        @test String(take!(io)) == expected
+        @test contains(String(take!(io)), expected)
     end
 
     A = sparse(Int64[1, 2, 4, 2, 3], Int64[1, 1, 1, 2, 2], Int64[1, 1, 1, 1, 1], 4, 2)
@@ -1578,7 +1578,7 @@ end
         show(io, MIME"text/plain"(), transform(A))
         @test String(take!(io)) == showstring
         _show_with_braille_patterns(convert(IOContext, io), transform(A))
-        @test String(take!(io)) == braille
+        @test contains(String(take!(io)), braille)
     end
 
     A = sparse(Int64[1, 3, 2, 4], Int64[1, 1, 2, 2], Int64[1, 1, 1, 1], 7, 3)
@@ -1597,7 +1597,7 @@ end
         show(io, MIME"text/plain"(), transform(A))
         @test String(take!(io)) == showstring
         _show_with_braille_patterns(convert(IOContext, io), transform(A))
-        @test String(take!(io)) == braille
+        @test contains(String(take!(io)), braille)
     end
 
     A = sparse(Int64[1:10;], Int64[1:10;], fill(Float64(1), 10))
@@ -1606,7 +1606,7 @@ end
                     "⎣⠀⠀⠀⠀⠑⎦"
     for transform in (identity, adjoint, transpose)
         _show_with_braille_patterns(convert(IOContext, io), transform(A))
-        @test String(take!(io)) == brailleString
+        @test contains(String(take!(io)), brailleString)
     end
 
     # Issue #30589
@@ -1622,22 +1622,22 @@ end
     # vertical scaling
     ioc = IOContext(io, :displaysize => (5, 80), :limit => true)
     _show_with_braille_patterns(ioc, _filled_sparse(10, 10))
-    @test String(take!(io)) == "⎡⣿⣿⎤\n" *
-                               "⎣⣿⣿⎦"
+    @test contains(String(take!(io)), "⎡⣿⣿⎤\n" *
+                                      "⎣⣿⣿⎦")
 
     _show_with_braille_patterns(ioc, _filled_sparse(20, 10))
-    @test String(take!(io)) == "⎡⣿⣿⎤\n" *
-                               "⎣⣿⣿⎦"
+    @test contains(String(take!(io)), "⎡⣿⣿⎤\n" *
+                                      "⎣⣿⣿⎦")
 
     # horizontal scaling
     ioc = IOContext(io, :displaysize => (80, 4), :limit => true)
     _show_with_braille_patterns(ioc, _filled_sparse(8, 8))
-    @test String(take!(io)) == "⎡⣿⣿⎤\n" *
-                               "⎣⣿⣿⎦"
+    @test contains(String(take!(io)), "⎡⣿⣿⎤\n" *
+                                      "⎣⣿⣿⎦")
 
     _show_with_braille_patterns(ioc, _filled_sparse(8, 16))
-    @test String(take!(io)) == "⎡⣿⣿⎤\n" *
-                               "⎣⣿⣿⎦"
+    @test contains(String(take!(io)), "⎡⣿⣿⎤\n" *
+                                      "⎣⣿⣿⎦")
 
     # respect IOContext while displaying J
     I, J, V = shuffle(1:50), shuffle(1:50), [1:50;]