Skip to content

Improve consistency of Julia code for Gaussian elimination #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 18, 2018
Merged

Improve consistency of Julia code for Gaussian elimination #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions chapters/algorithms/gaussian_elimination/code/julia/gaussian_elimination.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function back_substitution(A::Array{Float64,2})
end


function gauss_jordan(A::Array{Float64,2})
function gauss_jordan_elimination(A::Array{Float64,2})

rows = size(A,1)
cols = size(A,2)
Expand All @@ -83,7 +83,7 @@ function gauss_jordan(A::Array{Float64,2})
for i = cols:-1:col
A[row,i] /= A[row,col]
end

# subtract value from above row and set values above pivot to 0
for i = 1:row-1
for j = cols:-1:col
Expand All @@ -93,8 +93,6 @@ function gauss_jordan(A::Array{Float64,2})
row += 1
end
end

return A
end

function main()
Expand All @@ -105,8 +103,8 @@ function main()
gaussian_elimination(A)
println(A)

reduced = gauss_jordan(A)
println(reduced)
gauss_jordan_elimination(A)
println(A)

soln = back_substitution(A)
println(soln)
Expand Down
6 changes: 3 additions & 3 deletions chapters/algorithms/gaussian_elimination/gaussian_elimination.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,13 +383,13 @@ Here it is in code:

{% method %}
{% sample lang="jl" %}
[import:70-98, lang:"julia"](code/julia/gaussian_elimination.jl)
[import:70-96, lang:"julia"](code/julia/gaussian_elimination.jl)
{% sample lang="c" %}
This code does not exist yet in C, so here's Julia code (sorry for the inconvenience)
[import:70-98, lang:"julia"](code/julia/gaussian_elimination.jl)
[import:70-96, lang:"julia"](code/julia/gaussian_elimination.jl)
{% sample lang="rs" %}
This code does not exist yet in rust, so here's Julia code (sorry for the inconvenience)
[import:70-98, lang:"julia"](code/julia/gaussian_elimination.jl)
[import:70-96, lang:"julia"](code/julia/gaussian_elimination.jl)
{% endmethod %}

## Back-substitution
Expand Down