Merge pull request #84 from dlfivefifty/patch-1

Fix for new BlockBandedMatrices

Author: ChrisRackauckas

Project.toml

@@ -22,12 +22,12 @@ Adapt = "1"
 ArrayInterface = "1.1, 2.0"
 Compat = "2.2, 3"
 DataStructures = "0.17"
-DiffEqDiffTools = "1.3"
+DiffEqDiffTools = "1.7"
 ForwardDiff = "0.10"
 LightGraphs = "1.3"
 Requires = "0.5, 1.0"
 VertexSafeGraphs = "0.1"
-julia = "1"
+julia = "1.2"
 
 [extras]
 BandedMatrices = "aae01518-5342-5314-be14-df237901396f"

test/test_ad.jl

@@ -215,7 +215,7 @@ function f(out, x)
 	return vec(out)
 end
 x = rand(10000)
-J = BandedBlockBandedMatrix(Ones(10000, 10000), (fill(100, 100), fill(100, 100)), (1, 1), (1, 1))
+J = BandedBlockBandedMatrix(Ones(10000, 10000), fill(100, 100), fill(100, 100), (1, 1), (1, 1))
 Jsparse = sparse(J)
 colors = matrix_colors(J)
 forwarddiff_color_jacobian!(J, f, x, colorvec=colors)

test/test_specialmatrices.jl

@@ -15,11 +15,11 @@ tridiagonal=Tridiagonal(dense)
 symtridiagonal=SymTridiagonal(dense)
 
 banded=BandedMatrix(dense,(1,2))
-blockbanded1=BlockBandedMatrix(dense,([1,2,3,4],[4,3,2,1]),(1,0))
-blockbanded2=BlockBandedMatrix(dense,([4,3,2,1],[1,2,3,4]),(1,1))
-bandedblockbanded1=BandedBlockBandedMatrix(dense,([1,2,3,4],[4,3,2,1]),(1,0),(1,1))
-bandedblockbanded2=BandedBlockBandedMatrix(dense,([4,3,2,1],[1,2,3,4]),(1,1),(1,0))
-bandedblockbanded3 = BandedBlockBandedMatrix(Zeros(2 * 4 , 2 * 4), ([4, 4] ,[4, 4]), (1, 1), (1, 1))
+blockbanded1=BlockBandedMatrix(dense,[1,2,3,4],[4,3,2,1],(1,0))
+blockbanded2=BlockBandedMatrix(dense,[4,3,2,1],[1,2,3,4],(1,1))
+bandedblockbanded1=BandedBlockBandedMatrix(dense,[1,2,3,4],[4,3,2,1],(1,0),(1,1))
+bandedblockbanded2=BandedBlockBandedMatrix(dense,[4,3,2,1],[1,2,3,4],(1,1),(1,0))
+bandedblockbanded3 = BandedBlockBandedMatrix(Zeros(2 * 4 , 2 * 4), [4, 4] ,[4, 4], (1, 1), (1, 1))
 
 @test matrix_colors(dense)==1:n
 @test matrix_colors(uptri)==1:n
@@ -42,7 +42,7 @@ function _testvalidity(A)
     colorvec=matrix_colors(A)
     ncolor=maximum(colorvec)
     for colorvec in 1:ncolor
-        subA=A[:,findall(x->x==colorvec,colorvec)]
+        subA=Array(A)[:,findall(x->x==colorvec,colorvec)]
         @test maximum(sum(subA,dims=2))<=1.0
     end
 end