@@ -101,10 +101,10 @@ function expand_derivatives(O::Term, simplify=true; occurances=nothing)
101
101
x = if _iszero (t2)
102
102
t2
103
103
elseif _isone (t2)
104
- d = derivative (o, i)
104
+ d = derivative_idx (o, i)
105
105
d isa NoDeriv ? D (o) : d
106
106
else
107
- t1 = derivative (o, i)
107
+ t1 = derivative_idx (o, i)
108
108
t1 = t1 isa NoDeriv ? D (o) : t1
109
109
make_operation (* , [t1, t2])
110
110
end
@@ -159,7 +159,7 @@ julia> using ModelingToolkit
159
159
160
160
julia> @variables x y;
161
161
162
- julia> ModelingToolkit.derivative (sin(x), 1)
162
+ julia> ModelingToolkit.derivative_idx (sin(x), 1)
163
163
cos(x())
164
164
```
165
165
@@ -173,20 +173,20 @@ sin(x()) * y() ^ 2
173
173
julia> typeof(myop.op) # Op is multiplication function
174
174
typeof(*)
175
175
176
- julia> ModelingToolkit.derivative (myop, 1) # wrt. sin(x)
176
+ julia> ModelingToolkit.derivative_idx (myop, 1) # wrt. sin(x)
177
177
y() ^ 2
178
178
179
- julia> ModelingToolkit.derivative (myop, 2) # wrt. y^2
179
+ julia> ModelingToolkit.derivative_idx (myop, 2) # wrt. y^2
180
180
sin(x())
181
181
```
182
182
"""
183
- derivative (O:: Term , idx ) = derivative (O . op, (O . args ... ,), Val (idx))
184
- derivative (O:: Any , :: Any ) = 0
183
+ derivative_idx (O:: Any , :: Any ) = 0
184
+ derivative_idx (O:: Term , idx ) = derivative (O . op, (O . args ... ,), Val (idx))
185
185
186
186
# Indicate that no derivative is defined.
187
187
struct NoDeriv
188
188
end
189
- derivative (f, args:: Tuple , v:: Val ) = NoDeriv ()
189
+ derivative (f, args, v) = NoDeriv ()
190
190
191
191
# Pre-defined derivatives
192
192
import DiffRules
0 commit comments