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
2 changes: 1 addition & 1 deletion src/Nonlinear/SymbolicAD/SymbolicAD.jl
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ function derivative(f::MOI.ScalarNonlinearFunction, x::MOI.VariableIndex)
return MOI.ScalarNonlinearFunction(
:/,
Any[
MOI.ScalarNonlinearFunction(:+, Any[u_dv_dx, v_du_dx]),
MOI.ScalarNonlinearFunction(:-, Any[v_du_dx, u_dv_dx]),
MOI.ScalarNonlinearFunction(:+, Any[u_2, v_2]),
],
)
Expand Down
29 changes: 26 additions & 3 deletions test/Nonlinear/test_SymbolicAD.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ module TestMathOptSymbolicAD

using Test

import ForwardDiff
import MathOptInterface as MOI
import MathOptInterface: Nonlinear

const SymbolicAD = Nonlinear.SymbolicAD
import MathOptInterface.Nonlinear: SymbolicAD

function runtests()
for name in names(@__MODULE__; all = true)
Expand Down Expand Up @@ -100,7 +100,7 @@ function test_derivative()
# :atan
op(:atan, x, sin_x)=>op(
:/,
op(:+, op(:*, x, cos_x), sin_x),
op(:-, sin_x, op(:*, x, cos_x)),
op(:+, op(:^, x, 2), op(:^, sin_x, 2)),
),
# :min
Expand Down Expand Up @@ -785,6 +785,29 @@ function test_simplify_drops_ones()
return
end

function test_atan_derivatives()
model = MOI.Utilities.Model{Float64}()
u, v = MOI.VariableIndex.(1:2)
f = MOI.ScalarNonlinearFunction(:atan, Any[u, v])
f_u = MOI.Nonlinear.SymbolicAD.derivative(f, u)
f_v = MOI.Nonlinear.SymbolicAD.derivative(f, v)
for x in -1.0:0.5:1.0, y in -1.0:0.5:1.0
if iszero(x) && iszero(y)
continue
end
point = Dict(u => x, v => y)
@test isapprox(
MOI.Utilities.eval_variables(xi -> point[xi], model, f_u),
ForwardDiff.derivative(a -> atan(a, y), x),
)
@test isapprox(
MOI.Utilities.eval_variables(xi -> point[xi], model, f_v),
ForwardDiff.derivative(b -> atan(x, b), y),
)
end
return
end

end # module

TestMathOptSymbolicAD.runtests()
Loading