Skip to content

Commit c0ce24b

Browse files
mika314leios
authored andcommitted
Improve consistency of Julia code for Gaussian elimination (#269)
- rename gauss_jordan function to gauss_jordan_elimination - do gauss_jordan_elimination in-place, to match with gaussian_elimination
1 parent c052e21 commit c0ce24b

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

chapters/algorithms/gaussian_elimination/code/julia/gaussian_elimination.jl

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function back_substitution(A::Array{Float64,2})
6767
end
6868

6969

70-
function gauss_jordan(A::Array{Float64,2})
70+
function gauss_jordan_elimination(A::Array{Float64,2})
7171

7272
rows = size(A,1)
7373
cols = size(A,2)
@@ -83,7 +83,7 @@ function gauss_jordan(A::Array{Float64,2})
8383
for i = cols:-1:col
8484
A[row,i] /= A[row,col]
8585
end
86-
86+
8787
# subtract value from above row and set values above pivot to 0
8888
for i = 1:row-1
8989
for j = cols:-1:col
@@ -93,8 +93,6 @@ function gauss_jordan(A::Array{Float64,2})
9393
row += 1
9494
end
9595
end
96-
97-
return A
9896
end
9997

10098
function main()
@@ -105,8 +103,8 @@ function main()
105103
gaussian_elimination(A)
106104
println(A)
107105

108-
reduced = gauss_jordan(A)
109-
println(reduced)
106+
gauss_jordan_elimination(A)
107+
println(A)
110108

111109
soln = back_substitution(A)
112110
println(soln)

chapters/algorithms/gaussian_elimination/gaussian_elimination.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,13 +383,13 @@ Here it is in code:
383383

384384
{% method %}
385385
{% sample lang="jl" %}
386-
[import:70-98, lang:"julia"](code/julia/gaussian_elimination.jl)
386+
[import:70-96, lang:"julia"](code/julia/gaussian_elimination.jl)
387387
{% sample lang="c" %}
388388
This code does not exist yet in C, so here's Julia code (sorry for the inconvenience)
389-
[import:70-98, lang:"julia"](code/julia/gaussian_elimination.jl)
389+
[import:70-96, lang:"julia"](code/julia/gaussian_elimination.jl)
390390
{% sample lang="rs" %}
391391
This code does not exist yet in rust, so here's Julia code (sorry for the inconvenience)
392-
[import:70-98, lang:"julia"](code/julia/gaussian_elimination.jl)
392+
[import:70-96, lang:"julia"](code/julia/gaussian_elimination.jl)
393393
{% endmethod %}
394394

395395
## Back-substitution

0 commit comments

Comments
 (0)