Skip to content

Commit

Permalink
Merge branch 'maste'
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisRackauckas committed Nov 3, 2017
2 parents c2382eb + 13955a8 commit e9d0efc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions test/dde_tests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ h = (t) -> [0.5, 0.5]
u0 = [0.5, 0.5]
tspan = (0., 10.)

prob = ConstantLagDDEProblem((t,u,h,du)->f_lotka(t,u,h,[0.5, 1.],du),h,u0,[0.5], tspan)
prob = DDEProblem((t,u,h,du)->f_lotka(t,u,h,[0.5, 1.],du),h,u0,tspan,[0.5])
sol = solve(prob, MethodOfSteps(Tsit5()))

t = collect(linspace(0,10,30))
Expand All @@ -17,7 +17,7 @@ data = convert(Array, randomized)

using DiffEqParamEstim, NLopt

prob_opt = ConstantLagDDEProblem((t,u,h,p,du)->f_lotka(t,u,h,[p[1],1.],du), h, u0, [0.5], tspan)
prob_opt = DDEProblem((t,u,h,p,du)->f_lotka(t,u,h,[p[1],1.],du), h, u0, tspan,[0.5])
cost_function = build_loss_objective(prob_opt, MethodOfSteps(Tsit5()),L2Loss(t,data),maxiter=10000,abstol=1e-8,reltol=1e-8)

opt = Opt(:GN_ESCH, 1)
Expand Down

0 comments on commit e9d0efc

Please sign in to comment.