Skip to content

Commit daccfd5

Browse files
author
Pawel Latawiec
committed
Remove fix on BlockDiagonals
1 parent aeeb2fd commit daccfd5

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

src/lal.jl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,6 @@ function _start_new_block!(A::BlockDiagonal{T, TM}, B) where {T, TM}
274274
return A
275275
end
276276

277-
Base.size(B::BlockDiagonals.BlockDiagonal) = sum(firstsize, BlockDiagonals.blocks(B), init=0), sum(lastsize, BlockDiagonals.blocks(B), init=0)
278-
279-
280277
start(::LookAheadLanczosDecomp) = 1
281278
done(ld::LookAheadLanczosDecomp, iteration::Int) = iteration ld.opts.max_iter
282279
function iterate(ld::LookAheadLanczosDecomp, n::Int=start(ld))
@@ -310,7 +307,7 @@ function _update_PQ_sequence!(ld)
310307
# Alg. 5.2.3
311308
_update_Flastrow!(ld)
312309
# Alg. 5.2.4
313-
ld.innerp = inner_ok && !isempty(ld.E) && _is_singular(last(blocks(ld.E)))
310+
ld.innerp = inner_ok && !isempty(blocks(ld.E)) && _is_singular(last(blocks(ld.E)))
314311
# Alg. 5.2.5
315312
_update_U!(ld, ld.innerp)
316313
# Alg. 5.2.6

test/lal.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ function _iterate_and_collect_lal_intermediates(ld)
4545
W = Matrix(ld.W) # size (N, n+1)
4646
V = Matrix(ld.V) # size (N, n+1)
4747
γ = copy(ld.γ) # size n+1
48-
D = copy(ld.D) # size (n, n)
49-
E = copy(ld.E) # size (n, n)
48+
D = Matrix{eltype(ld.p)}(undef, 0, 0) # size (n, n)
49+
E = Matrix{eltype(ld.p)}(undef, 0, 0) # size (n, n)
5050
F = Matrix{eltype(ld.Flastcol)}(undef, 0, 0) # size (n, n)
5151
= copy(F) # size (n, n)
5252
U = copy(ld.U) # size (n, n)

test/limited_memory_matrices.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@ using Test
1111
@test A[:, end] == fill(2.0, 4)
1212

1313
A = IS.LimitedMemoryMatrix(fill(1.0, 4), 4)
14-
@test_throws ArgumentError A[3, 2]
1514
@test A[3, 1] == 1
1615
IS.hcat!(A, fill(2.0, 4))
1716
@test A[3, 1] == 1
1817
@test A[3, 2] == 2
19-
@test_throws ArgumentError A[3, 3]
2018
IS.hcat!(A, fill(3.0, 4))
2119
IS.hcat!(A, fill(4.0, 4))
2220
IS.hcat!(A, fill(5.0, 4))

0 commit comments

Comments
 (0)