Skip to content

Commit 8a86729

Browse files
committed
Remove to_symbolic
1 parent 1af19c4 commit 8a86729

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

src/ModelingToolkit.jl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RuntimeGeneratedFunctions.init(@__MODULE__)
2323
using RecursiveArrayTools
2424

2525
import SymbolicUtils
26-
import SymbolicUtils: Term, Add, Mul, Pow, Sym, to_symbolic, FnType,
26+
import SymbolicUtils: Term, Add, Mul, Pow, Sym, FnType,
2727
@rule, Rewriters, substitute, similarterm,
2828
promote_symtype
2929

@@ -55,8 +55,6 @@ value(x) = x
5555
value(x::Num) = x.val
5656

5757

58-
using SymbolicUtils: to_symbolic
59-
SymbolicUtils.to_symbolic(n::Num) = value(n)
6058
SymbolicUtils.@number_methods(Num,
6159
Num(f(value(a))),
6260
Num(f(value(a), value(b))))

src/build_function.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ function unflatten_long_ops(op, N=4)
9393
rule2 = @rule((*)((~~x)) => length(~~x) > N ?
9494
*(*((~~x)[1:N]...) * (*)((~~x)[N+1:end]...)) : nothing)
9595

96-
op = to_symbolic(op)
96+
op = value(op)
9797
Rewriters.Fixpoint(Rewriters.Postwalk(Rewriters.Chain([rule1, rule2])))(op)
9898
end
9999

src/utils.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ substitute(expr, s::Vector; kw...) = substituter(s)(expr; kw...)
141141

142142
substituter(pair::Pair) = substituter((pair,))
143143
function substituter(pairs)
144-
dict = Dict(to_symbolic(k) => to_symbolic(v) for (k, v) in pairs)
144+
dict = Dict(value(k) => value(v) for (k, v) in pairs)
145145
(expr; kw...) -> SymbolicUtils.substitute(expr, dict; kw...)
146146
end
147147

test/simplify.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using ModelingToolkit
2+
using ModelingToolkit: value
23
using Test
34

45
@parameters t
@@ -34,11 +35,11 @@ d3 = Differential(x)(d2)
3435
@test ModelingToolkit.substitute(2x + y == 1, Dict(x => 0.0, y => 1.0)) === true
3536

3637
# 699
37-
using SymbolicUtils: to_symbolic, substitute
38+
using SymbolicUtils: value, substitute
3839
@parameters t a(t) b(t)
3940

4041
# back and forth substitution does not work for parameters with dependencies
41-
term = to_symbolic(a)
42+
term = value(a)
4243
term2 = substitute(term, a=>b)
4344
@test term2 isa Term{ModelingToolkit.Parameter{Real}}
4445
@test isequal(term2, b)

0 commit comments

Comments
 (0)