Skip to content

Commit 959f884

Browse files
undo formatting
1 parent d619511 commit 959f884

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

src/aggregation.jl

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
function smoothed_aggregation(A::TA, _B=nothing,
2-
::Type{Val{bs}}=Val{1};
3-
symmetry=HermitianSymmetry(),
4-
strength=SymmetricStrength(),
5-
aggregate=StandardAggregation(),
6-
smooth=JacobiProlongation(4.0 / 3.0),
7-
presmoother=GaussSeidel(),
8-
postsmoother=GaussSeidel(),
9-
improve_candidates=GaussSeidel(iter=4),
10-
max_levels=10,
11-
max_coarse=10,
12-
diagonal_dominance=false,
13-
keep=false,
14-
coarse_solver=Pinv, kwargs...) where {T,V,bs,TA<:SparseMatrixCSC{T,V}}
1+
function smoothed_aggregation(A::TA, _B = nothing,
2+
::Type{Val{bs}}=Val{1};
3+
symmetry = HermitianSymmetry(),
4+
strength = SymmetricStrength(),
5+
aggregate = StandardAggregation(),
6+
smooth = JacobiProlongation(4.0/3.0),
7+
presmoother = GaussSeidel(),
8+
postsmoother = GaussSeidel(),
9+
improve_candidates = GaussSeidel(iter=4),
10+
max_levels = 10,
11+
max_coarse = 10,
12+
diagonal_dominance = false,
13+
keep = false,
14+
coarse_solver = Pinv, kwargs...) where {T,V,bs,TA<:SparseMatrixCSC{T,V}}
1515

1616
n = size(A, 1)
17-
B = isnothing(_B) ? ones(T, n, 1) : copy(_B)
17+
B = isnothing(_B) ? ones(T,n,1) : copy(_B)
1818
@assert size(A, 1) == size(B, 1)
1919

2020
#=max_levels, max_coarse, strength =
@@ -28,15 +28,15 @@ function smoothed_aggregation(A::TA, _B=nothing,
2828
# agg = [aggregate for _ in 1:max_levels - 1]
2929
# sm = [smooth for _ in 1:max_levels]
3030

31-
levels = Vector{Level{TA,TA,Adjoint{T,TA}}}()
31+
levels = Vector{Level{TA, TA, Adjoint{T, TA}}}()
3232
bsr_flag = false
3333
w = MultiLevelWorkspace(Val{bs}, eltype(A))
3434
residual!(w, size(A, 1))
3535

3636
while length(levels) + 1 < max_levels && size(A, 1) > max_coarse
3737
A, B, bsr_flag = extend_hierarchy!(levels, strength, aggregate, smooth,
38-
improve_candidates, diagonal_dominance,
39-
keep, A, B, symmetry, bsr_flag)
38+
improve_candidates, diagonal_dominance,
39+
keep, A, B, symmetry, bsr_flag)
4040
coarse_x!(w, size(A, 1))
4141
coarse_b!(w, size(A, 1))
4242
#=if size(A, 1) <= max_coarse
@@ -54,9 +54,9 @@ struct HermitianSymmetry
5454
end
5555

5656
function extend_hierarchy!(levels, strength, aggregate, smooth,
57-
improve_candidates, diagonal_dominance, keep,
58-
A, B,
59-
symmetry, bsr_flag)
57+
improve_candidates, diagonal_dominance, keep,
58+
A, B,
59+
symmetry, bsr_flag)
6060

6161
# Calculate strength of connection matrix
6262
if symmetry isa HermitianSymmetry
@@ -70,7 +70,7 @@ function extend_hierarchy!(levels, strength, aggregate, smooth,
7070
# b = zeros(eltype(A), size(A, 1))
7171

7272
# Improve candidates
73-
b = zeros(size(A, 1))
73+
b = zeros(size(A,1))
7474
improve_candidates(A, B, b)
7575
T, B = fit_candidates(AggOp, B)
7676

0 commit comments

Comments
 (0)