last test is broken

Author: ChrisRackauckas

src/systems/diffeqs/modelingtoolkitize.jl

@@ -99,7 +99,7 @@ function modelingtoolkitize(prob::DiffEqBase.OptimizationProblem)
         p = prob.p
     end
 
-    vars = reshape([Variable(:x, i)(t) for i in eachindex(prob.u0)],size(prob.u0))
+    vars = reshape([Variable(:x, i)() for i in eachindex(prob.u0)],size(prob.u0))
     params = p isa DiffEqBase.NullParameters ? [] :
              reshape([Variable(:α,i)() for i in eachindex(p)],size(Array(p)))
 

src/systems/optimization/optimizationsystem.jl

@@ -134,7 +134,7 @@ function DiffEqBase.OptimizationProblem{iip}(sys::OptimizationSystem, u0,
         _hess = nothing
     end
 
-    _f = OptimizationFunction{iip,typeof(f),typeof(_grad),typeof(_hess),Nothing,Nothing,Nothing,Nothing}(f,_grad,_hess,nothing,AutoModelingToolkit(),nothing,nothing,nothing,0)
+    _f = DiffEqBase.OptimizationFunction{iip,AutoModelingToolkit,typeof(f),typeof(_grad),typeof(_hess),Nothing,Nothing,Nothing,Nothing}(f,AutoModelingToolkit(),_grad,_hess,nothing,nothing,nothing,nothing,0)
 
     p = varmap_to_vars(parammap,ps)
     lb = varmap_to_vars(lb,dvs)
@@ -205,7 +205,7 @@ function OptimizationProblemExpr{iip}(sys::OptimizationSystem, u0,
 end
 
 function OptimizationFunction(f, x, ::AutoModelingToolkit,p = DiffEqBase.NullParameters();
-                              grad=nothing, hess=nothing, cons = nothing, cons_j = nothing, cons_h = nothing,
+                              grad=false, hess=false, cons = nothing, cons_j = nothing, cons_h = nothing,
                               num_cons = 0, chunksize = 1, hv = nothing)
 
     sys = modelingtoolkitize(OptimizationProblem(f,x,p))
@@ -215,5 +215,5 @@ function OptimizationFunction(f, x, ::AutoModelingToolkit,p = DiffEqBase.NullPar
     else
         parammap = parameters(sys) .=> p
     end
-    OptimiationProblem(sys,u0map,parammap,grad=grad,hess=hess)
+    OptimizationProblem(sys,u0map,parammap,grad=grad,hess=hess).f
 end

test/modelingtoolkitize.jl

@@ -1,4 +1,6 @@
-using OrdinaryDiffEq, ModelingToolkit
+using OrdinaryDiffEq, ModelingToolkit, Test
+using GalacticOptim, Optim
+
 const N = 32
 const xyd_brusselator = range(0,stop=1,length=N)
 brusselator_f(x, y, t) = (((x-0.3)^2 + (y-0.6)^2) <= 0.1^2) * (t >= 1.1) * 5.
@@ -38,3 +40,21 @@ prob_ode_brusselator_2d = ODEProblem(brusselator_2d_loop,
                                      u0,(0.,11.5),p)
 
 modelingtoolkitize(prob_ode_brusselator_2d)
+
+## Optimization
+
+rosenbrock(x,p) =  (p[1] - x[1])^2 + p[2] * (x[2] - x[1]^2)^2
+x0 = zeros(2)
+p  = [1.0,100.0]
+
+prob = OptimizationProblem(rosenbrock,x0,p)
+sys = modelingtoolkitize(prob)
+
+prob = OptimizationProblem(ModelingToolkit.OptimizationFunction(
+                    rosenbrock,x0,ModelingToolkit.AutoModelingToolkit(),p,
+                                     grad = true), x0,p)
+sol = solve(prob,NelderMead())
+@test sol.minimum < 1e-8
+
+sol = solve(prob,BFGS())
+@test_broken sol.minimum < 1e-8