Skip to content

Commit a919c23

Browse files
committed
Fix more typos
1 parent 0374a56 commit a919c23

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

src/systems/alias_elimination.jl

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ function alias_elimination(sys)
1111
end
1212
is_linear_equations, eadj, cadj = find_linear_equations(sys)
1313

14-
sys, v_eliminated, v_types, n_null_vars, degenerate_equations, linear_equations = alias_eliminate_graph(
14+
v_eliminated, v_types, n_null_vars, degenerate_equations, linear_equations = alias_eliminate_graph(
1515
s, is_linear_equations, eadj, cadj
1616
)
1717

1818
s = structure(sys)
19-
@unpack fullvars = s
19+
@unpack fullvars, graph = s
2020

2121
subs = Dict()
2222
if length(v_eliminated) - n_null_vars > 0
@@ -48,7 +48,7 @@ function alias_elimination(sys)
4848
if !isdiffeq(eq) && !_iszero(eq.lhs)
4949
eq = 0 ~ eq.rhs - eq.lhs
5050
end
51-
eqs[ieq] = eq.lhs ~ fixpoint_sub(eq.rhs, dict)
51+
eqs[ieq] = eq.lhs ~ fixpoint_sub(eq.rhs, subs)
5252
end
5353

5454
newstates = []
@@ -59,8 +59,9 @@ function alias_elimination(sys)
5959
end
6060
end
6161

62-
@set sys.structure = nothing
63-
@set sys.states = newstates
62+
@set! sys.eqs = eqs
63+
@set! sys.states = newstates
64+
@set! sys.structure = nothing
6465
return sys
6566
end
6667

@@ -72,7 +73,7 @@ function alias_eliminate_graph(s::SystemStructure, is_linear_equations, eadj, ca
7273

7374
is_not_potential_state = iszero.(varassoc)
7475
is_linear_variables = copy(is_not_potential_state)
75-
for i in 𝑠vertices(graph); is_linear_equations[i] || continue
76+
for i in 𝑠vertices(graph); is_linear_equations[i] && continue
7677
for j in 𝑠neighbors(graph, i)
7778
is_linear_variables[j] = false
7879
end
@@ -109,7 +110,7 @@ function alias_eliminate_graph(s::SystemStructure, is_linear_equations, eadj, ca
109110
# kind of like the backward substitution
110111
for ei in reverse(1:rank2)
111112
locally_structure_simplify!(
112-
(eadj[ei], cadj[ei]),
113+
(eadj[ei], old_cadj[ei]),
113114
invvarassoc, v_eliminated, v_types
114115
)
115116
end
@@ -145,7 +146,7 @@ function alias_eliminate_graph(s::SystemStructure, is_linear_equations, eadj, ca
145146
end
146147

147148
for (ei, e) in enumerate(linear_equations)
148-
graph.eadjlist[e] = eadj[ei]
149+
graph.fadjlist[e] = eadj[ei]
149150
end
150151

151152
degenerate_equations = rank3 < length(linear_equations) ? linear_equations[rank3+1:end] : Int[]

0 commit comments

Comments
 (0)