Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions lib/ModelingToolkitTearing/src/stateselection_interface.jl
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ function eq_derivative_mm!(ts::TearingState, ieq::Int, eq_diff::Int, idx::Int)
map!(Base.Fix1(getindex, s.var_to_diff), rcol, rcol)
# Add to `mm`
@assert eq_diff > last(mm.nzrows)
if !issorted(rcol)
perm = sortperm(rcol)
rcol = rcol[perm]
rval = rval[perm]
end
push!(mm.nzrows, eq_diff)
push!(mm.row_cols, rcol)
push!(mm.row_vals, rval)
Expand Down
9 changes: 8 additions & 1 deletion lib/ModelingToolkitTearing/src/tearingstate.jl
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,7 @@ function __get_expression_sort_key!(
for t in arg_k
push!(result, (t[1], t[2] * v, t[3]))
end
length(result) > 100 && break
end
else
if coeff isa Real
Expand All @@ -522,6 +523,7 @@ function __get_expression_sort_key!(
for t in arg_k
push!(result, (t[1], t[2] ^ v * cf, t[3] + v))
end
length(result) > 100 && break
end
end
return result
Expand All @@ -538,15 +540,20 @@ function __get_expression_sort_key!(
v = convert(Float64, val)
return map(k -> (k[1], k[2] ^ v, k[3] + v), base_key)
else
length(base_key) > 100 && return base_key
return vcat(base_key, get_expression_sort_key!(cache, args[2], var2idx, canonical_ranks))
end
_ => begin
length(base_key) > 100 && return base_key
return vcat(base_key, get_expression_sort_key!(cache, args[2], var2idx, canonical_ranks))
end
_ => return vcat(base_key, get_expression_sort_key!(cache, args[2], var2idx, canonical_ranks))
end
return base_key
end
result = eltype(EquationSortKeyT)[]
for arg in args
append!(result, get_expression_sort_key!(cache, arg, var2idx, canonical_ranks))
length(result) > 100 && break
end
return result
end
Expand Down
Loading