Add Optim to tests

Author: MilesCranmer

Project.toml

@@ -29,6 +29,7 @@ DynamicExpressionsZygoteExt = "Zygote"
 Aqua = "0.7"
 Compat = "3.37, 4"
 LoopVectorization = "0.12"
+Optim = "0.19, 1"
 MacroTools = "0.4, 0.5"
 PackageExtensionCompat = "1"
 PrecompileTools = "1"
@@ -40,6 +41,7 @@ julia = "1.6"
 [extras]
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
+Optim = "429524aa-4258-5aef-a3af-852621145aeb"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
 SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
@@ -48,4 +50,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 [targets]
-test = ["Test", "SafeTestsets", "Aqua", "SpecialFunctions", "ForwardDiff", "StaticArrays", "SymbolicUtils", "Zygote"]
+test = ["Test", "SafeTestsets", "Aqua", "Optim", "SpecialFunctions", "ForwardDiff", "StaticArrays", "SymbolicUtils", "Zygote"]

ext/DynamicExpressionsOptimExt.jl

@@ -1,14 +1,14 @@
 module DynamicExpressionsOptimExt
 
-using DynamicExpressions: Node, eval_tree_array
+using DynamicExpressions: AbstractExpressionNode, eval_tree_array
+using Compat: @inline
 
-import Compat: @inline
 import Optim: optimize
 
 """Wrap f with insertion of values of the constant nodes."""
 function get_wrapped_f(
     f::F, tree::N, constant_nodes::AbstractArray{N}
-) where {F,T,N<:Node{T}}
+) where {F,T,N<:AbstractExpressionNode{T}}
     function wrapped_f(x)
         for (ci, xi) in zip(constant_nodes, x)
             ci.val::T = xi::T
@@ -21,7 +21,7 @@ end
 """Wrap g! or h! with insertion of values of the constant nodes."""
 function get_wrapped_gh!(
     gh!::GH, tree::N, constant_nodes::AbstractArray{N}
-) where {GH,T,N<:Node{T}}
+) where {GH,T,N<:AbstractExpressionNode{T}}
     function wrapped_gh!(G, x)
         for (ci, xi) in zip(constant_nodes, x)
             ci.val::T = xi::T
@@ -32,9 +32,9 @@ function get_wrapped_gh!(
     return wrapped_gh!
 end
 
-function optimize(f::F, g!::G, h!::H, tree::Node{T}, args...; kwargs...) where {F,G,H,T}
+function optimize(f::F, g!::G, h!::H, tree::AbstractExpressionNode{T}, args...; kwargs...) where {F,G,H,T}
     constant_nodes = filter(t -> t.degree == 0 && t.constant, tree)
-    x0 = [t.val::T for t in constant_nodes]
+    x0 = T[t.val::T for t in constant_nodes]
     if g! === nothing
         @assert h! === nothing
         return optimize(get_wrapped_f(f, tree, constant_nodes), x0, args...; kwargs...)
@@ -57,10 +57,10 @@ function optimize(f::F, g!::G, h!::H, tree::Node{T}, args...; kwargs...) where {
         )
     end
 end
-function optimize(f::F, g!::G, tree::Node, args...; kwargs...) where {F,G}
+function optimize(f::F, g!::G, tree::AbstractExpressionNode, args...; kwargs...) where {F,G}
     return optimize(f, g!, nothing, tree, args...; kwargs...)
 end
-function optimize(f::F, tree::Node, args...; kwargs...) where {F}
+function optimize(f::F, tree::AbstractExpressionNode, args...; kwargs...) where {F}
     return optimize(f, nothing, tree, args...; kwargs...)
 end