Skip to content

Commit 68a3ca8

Browse files
janbruedigamjanbruedigam
committed
clean up
1 parent 62552b5 commit 68a3ca8

File tree

11 files changed

+37
-37
lines changed

11 files changed

+37
-37
lines changed

‎src/solvers/ldlt.jl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ function ldlt_solve!(system::System)
9090
return
9191
end
9292

93-
function ldlt_matrix_solve!(A::System, B::SparseMatrixCSC{Entry, Int64}; keep_vector = true)
94-
keep_vector && (vector_entries = deepcopy(A.vector_entries))
95-
ldlt_factorization!(A)
96-
C = matrix_backsubsitution!(A, B, ldlt_backsubstitution!)
97-
keep_vector && (A.vector_entries .= vector_entries)
93+
function ldlt_matrix_solve!(system::System, matrix::SparseMatrixCSC{Entry, Int64}; keep_vector = true)
94+
keep_vector && (vector_entries = deepcopy(system.vector_entries))
95+
ldlt_factorization!(system)
96+
C = matrix_backsubsitution!(system, matrix, ldlt_backsubstitution!)
97+
keep_vector && (system.vector_entries .= vector_entries)
9898

9999
return C
100100
end

‎src/solvers/ldu.jl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,11 @@ function ldu_solve!(system::System)
9191
return
9292
end
9393

94-
function ldu_matrix_solve!(A::System, B::SparseMatrixCSC{Entry, Int64}; keep_vector = true)
95-
keep_vector && (vector_entries = deepcopy(A.vector_entries))
96-
ldu_factorization!(A)
97-
C = matrix_backsubsitution!(A, B, ldu_backsubstitution!)
98-
keep_vector && (A.vector_entries .= vector_entries)
94+
function ldu_matrix_solve!(system::System, matrix::SparseMatrixCSC{Entry, Int64}; keep_vector = true)
95+
keep_vector && (vector_entries = deepcopy(system.vector_entries))
96+
ldu_factorization!(system)
97+
C = matrix_backsubsitution!(system, matrix, ldu_backsubstitution!)
98+
keep_vector && (system.vector_entries .= vector_entries)
9999

100100
return C
101101
end

‎src/solvers/llt.jl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ function llt_solve!(system::System)
9999
return
100100
end
101101

102-
function llt_matrix_solve!(A::System, B::SparseMatrixCSC{Entry, Int64}; keep_vector = true)
103-
keep_vector && (vector_entries = deepcopy(A.vector_entries))
104-
llt_factorization!(A)
105-
C = matrix_backsubsitution!(A, B, llt_backsubstitution!)
106-
keep_vector && (A.vector_entries .= vector_entries)
102+
function llt_matrix_solve!(system::System, matrix::SparseMatrixCSC{Entry, Int64}; keep_vector = true)
103+
keep_vector && (vector_entries = deepcopy(system.vector_entries))
104+
llt_factorization!(system)
105+
C = matrix_backsubsitution!(system, matrix, llt_backsubstitution!)
106+
keep_vector && (system.vector_entries .= vector_entries)
107107

108108
return C
109109
end

‎src/solvers/lu.jl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ function lu_solve!(system::System)
9090
return
9191
end
9292

93-
function lu_matrix_solve!(A::System, B::SparseMatrixCSC{Entry, Int64}; keep_vector = true)
94-
keep_vector && (vector_entries = deepcopy(A.vector_entries))
95-
lu_factorization!(A)
96-
C = matrix_backsubsitution!(A, B, lu_backsubstitution!)
97-
keep_vector && (A.vector_entries .= vector_entries)
93+
function lu_matrix_solve!(system::System, matrix::SparseMatrixCSC{Entry, Int64}; keep_vector = true)
94+
keep_vector && (vector_entries = deepcopy(system.vector_entries))
95+
lu_factorization!(system)
96+
C = matrix_backsubsitution!(system, matrix, lu_backsubstitution!)
97+
keep_vector && (system.vector_entries .= vector_entries)
9898

9999
return C
100100
end

‎src/solvers/matrix.jl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
# Assumes quadratic matrices of same size
2-
function matrix_backsubsitution!(systemA::System{N}, B::SparseMatrixCSC{Entry, Int64}, backsubsitution!) where N
3-
vector_entries = systemA.vector_entries
4-
dims = systemA.dims
2+
function matrix_backsubsitution!(system::System{N}, matrix::SparseMatrixCSC{Entry, Int64}, backsubsitution!) where N
3+
vector_entries = system.vector_entries
4+
dims = system.dims
55

6-
maxnnzC = Int(widelength(systemA.matrix_entries))
6+
maxnnzC = Int(widelength(system.matrix_entries))
77
C = _allocres((N,N), Int64, Entry, maxnnzC)
88
# _densestructure!(C)
99

1010
for i = 1:N
1111
for j = 1:N
12-
Bji = B[j,i]
12+
Bji = matrix[j,i]
1313
Bji isa Entry{Nothing} ? vector_entries[j] = Entry(dims[j], dims[i]) : vector_entries[j] = Bji
1414
end
15-
backsubsitution!(systemA)
15+
backsubsitution!(system)
1616
for j = 1:N
1717
C[j,i] = vector_entries[j]
1818
end

‎src/system/dense.jl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
full_matrix(system::System) = full_matrix(system.matrix_entries, issymmetric(system), system.dims, system.dims)
22
# There probably exists a smarter way of getting the dense matrix from the spares one
3-
function full_matrix(matrix_entries::SparseMatrixCSC, symmetric::Bool, dimensions_rows, dimensions_cols)
3+
function full_matrix(matrix::SparseMatrixCSC, symmetric::Bool, dimensions_rows, dimensions_cols)
44
range_dict_rows = ranges(dimensions_rows)
55
range_dict_cols = ranges(dimensions_cols)
66
A = zeros(sum(dimensions_rows), sum(dimensions_cols))
77

8-
for (i,row) in enumerate(matrix_entries.rowval)
9-
col = findfirst(x -> i<x, matrix_entries.colptr)-1
10-
A[range_dict_rows[row],range_dict_cols[col]] = matrix_entries[row,col].value
8+
for (i,row) in enumerate(matrix.rowval)
9+
col = findfirst(x -> i<x, matrix.colptr)-1
10+
A[range_dict_rows[row],range_dict_cols[col]] = matrix[row,col].value
1111
if symmetric && col != row
12-
A[range_dict_cols[col],range_dict_rows[row]] = matrix_entries[row,col].value'
12+
A[range_dict_cols[col],range_dict_rows[row]] = matrix[row,col].value'
1313
end
1414
end
1515
return A

‎src/system/interface.jl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ function reset_inverse_diagonals!(system::System)
5151
end
5252

5353
adjacency(system::System) = adjacency(system.matrix_entries)
54-
function adjacency(M::SparseMatrixCSC{Entry, Int64})
55-
N = size(M)[1]
54+
function adjacency(matrix::SparseMatrixCSC{Entry, Int64})
55+
N = size(matrix)[1]
5656
adj = zeros(Int64,N,N)
5757

5858
for i=1:N
5959
for j=1:N
6060
i == j && continue
61-
Mij = M[i,j]
61+
Mij = matrix[i,j]
6262
Mij isa Entry{Nothing} ? adj[i,j] = 0 : adj[i,j] = 1
6363
end
6464
end

‎src/system/system.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,4 +139,4 @@ function Base.:/(S1::System, r::Real)
139139
return S2
140140
end
141141
Base.:\(r::Real, S::System) = S/r
142-
Base.:\(A::System, B::SparseMatrixCSC{Entry, Int64}) = lu_matrix_solve!(A, B; keep_vector = true)
142+
Base.:\(system::System, matrix::SparseMatrixCSC{Entry, Int64}) = lu_matrix_solve!(system, matrix; keep_vector = true)

test/algebra.jl renamed to test/algebra_test.jl

File renamed without changes.

test/interface.jl renamed to test/interface_test.jl

File renamed without changes.

0 commit comments

Comments
 (0)