Skip to content

Commit 68596a7

Browse files
refactor: remove outdated functions
refactor: remove `controls(sys)` refactor: remove `solved_unknowns(sys)`
1 parent 28e7a5a commit 68596a7

File tree

2 files changed

+2
-43
lines changed

2 files changed

+2
-43
lines changed

src/systems/abstractsystem.jl

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ function SymbolicIndexingInterface.variable_index(sys::AbstractSystem, sym::Symb
282282
end
283283

284284
function SymbolicIndexingInterface.variable_symbols(sys::AbstractSystem)
285-
return solved_unknowns(sys)
285+
return unknowns(sys)
286286
end
287287

288288
function SymbolicIndexingInterface.is_parameter(sys::AbstractSystem, sym)
@@ -1175,7 +1175,6 @@ end
11751175

11761176
namespace_variables(sys::AbstractSystem) = unknowns(sys, unknowns(sys))
11771177
namespace_parameters(sys::AbstractSystem) = parameters(sys, parameters(sys))
1178-
namespace_controls(sys::AbstractSystem) = controls(sys, controls(sys))
11791178

11801179
function namespace_defaults(sys)
11811180
defs = defaults(sys)
@@ -1557,12 +1556,6 @@ end
15571556
# required in `src/connectors.jl:437`
15581557
parameters(_) = []
15591558

1560-
function controls(sys::AbstractSystem)
1561-
ctrls = get_ctrls(sys)
1562-
systems = get_systems(sys)
1563-
isempty(systems) ? ctrls : [ctrls; reduce(vcat, namespace_controls.(systems))]
1564-
end
1565-
15661559
"""
15671560
$(TYPEDSIGNATURES)
15681561
@@ -1783,19 +1776,6 @@ function isaffine(sys::AbstractSystem)
17831776
all(isaffine(r, unknowns(sys)) for r in rhs)
17841777
end
17851778

1786-
"""
1787-
$(SIGNATURES)
1788-
1789-
Return a list of actual unknowns needed to be solved by solvers.
1790-
"""
1791-
function solved_unknowns(sys::AbstractSystem)
1792-
sts = unknowns(sys)
1793-
if has_solved_unknowns(sys)
1794-
sts = something(get_solved_unknowns(sys), sts)
1795-
end
1796-
return sts
1797-
end
1798-
17991779
###
18001780
### System utils
18011781
###
@@ -1988,18 +1968,6 @@ end
19881968

19891969
Base.write(io::IO, sys::AbstractSystem) = write(io, readable_code(toexpr(sys)))
19901970

1991-
function get_or_construct_tearing_state(sys)
1992-
if has_tearing_state(sys)
1993-
state = get_tearing_state(sys)
1994-
if state === nothing
1995-
state = TearingState(sys)
1996-
end
1997-
else
1998-
state = nothing
1999-
end
2000-
state
2001-
end
2002-
20031971
"""
20041972
n_expanded_connection_equations(sys::AbstractSystem)
20051973
@@ -2135,15 +2103,6 @@ function Base.show(
21352103
return nothing
21362104
end
21372105

2138-
function Graphs.incidence_matrix(sys)
2139-
if has_torn_matching(sys) && has_tearing_state(sys)
2140-
state = get_tearing_state(sys)
2141-
incidence_matrix(state.structure.graph, Num(Sym{Real}(:×)))
2142-
else
2143-
return nothing
2144-
end
2145-
end
2146-
21472106
function split_assign(expr)
21482107
if !(expr isa Expr && expr.head === :(=) && expr.args[2].head === :call)
21492108
throw(ArgumentError("expression should be of the form `sys = foo(a, b)`"))

src/systems/index_cache.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ struct IndexCache
6464
end
6565

6666
function IndexCache(sys::AbstractSystem)
67-
unks = solved_unknowns(sys)
67+
unks = unknowns(sys)
6868
unk_idxs = UnknownIndexMap()
6969
symbol_to_variable = Dict{Symbol, SymbolicParam}()
7070

0 commit comments

Comments
 (0)