Short-circuit in block print (#93)

* Short-circuit in block print

* remove doc string

* v0.10.2

* Add sortedin tests

* use sortedin for matrices as well

Author: dlfivefifty

Project.toml

@@ -1,6 +1,6 @@
 name = "BlockArrays"
 uuid = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
-version = "0.10.1"
+version = "0.10.2"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

src/show.jl

@@ -2,6 +2,20 @@
 import Base.alignment
 
 # A bit of a mess but does the job...
+
+# sortedin(p, sc)
+# returns true if `p` is in `sc`, assuming that `sc` is monotonically increasing.
+function sortedin(x, itr)
+    for y in itr
+        if y == x
+            return true
+        elseif y > x
+            return false
+        end
+    end
+    return false
+end
+
 function _blockarray_print_matrix_row(io::IO,
         X::AbstractVecOrMat, A::Vector,
         i::Integer, cols::AbstractVector, sep::AbstractString)
@@ -53,9 +67,9 @@ function _blockarray_print_matrix_row(io::IO,
             n_chars -= 2
         end
 
-        if i in row_sum
+        if sortedin(i, row_sum)
             print(row_buf, "─"^(n_chars-1))
-            if ndims(X) == 2 && k in col_sum
+            if ndims(X) == 2 && sortedin(k,col_sum)
                 print(row_buf, "┼")
             else
                 print(row_buf, "─")

test/test_blockarrays.jl

@@ -460,4 +460,4 @@ end
     B[2,2] = fill(4.0f0,2,2)
     @test mortar(B) == A
     @test mortar(B)[1,1] == 1.0
-end
+end

test/test_blockindices.jl

@@ -72,3 +72,11 @@ end
     @test_throws BoundsError A[Block(2)[3]]
     @test_throws BoundsError A[Block(2)[3:3]]
 end
+
+@testset "sortedin" begin
+    v = [1,3,4]
+    @test BlockArrays.sortedin(1,v)
+    @test !BlockArrays.sortedin(2,v)
+    @test !BlockArrays.sortedin(0,v)
+    @test !BlockArrays.sortedin(5,v)
+end