Merge pull request SciML#7 from JuliaDiffEq/07

update to v0.7
benneti · Jul 18, 2018 · 65b6aef · 65b6aef
2 parents a95469e + 6970ae3
commit 65b6aef
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: julia
 os:
   - linux
 julia:
-  - 0.6
+  - 0.7
   - nightly
 matrix:
   allow_failures:

diff --git a/REQUIRE b/REQUIRE
@@ -1,4 +1,4 @@
-julia 0.6
+julia 0.7-beta2
 DiffEqBase 3.0.0
 NLsolve 0.14.0
 Compat 0.17.0

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,7 @@
 environment:
   matrix:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.7/julia-0.7-latest-win32.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
 

diff --git a/src/SteadyStateDiffEq.jl b/src/SteadyStateDiffEq.jl
@@ -6,11 +6,9 @@ using Reexport
 @reexport using DiffEqBase
 
 using NLsolve, DiffEqCallbacks
-
+using LinearAlgebra
 using Compat
 
-import DiffEqBase: solve
-
 include("algorithms.jl")
 include("solve.jl")
 

diff --git a/src/algorithms.jl b/src/algorithms.jl
@@ -1,4 +1,4 @@
-abstract type SteadyStateDiffEqAlgorithm <: AbstractSteadyStateAlgorithm end
+abstract type SteadyStateDiffEqAlgorithm <: DiffEqBase.AbstractSteadyStateAlgorithm end
 
 struct SSRootfind{F} <: SteadyStateDiffEqAlgorithm
   nlsolve::F

diff --git a/src/solve.jl b/src/solve.jl
@@ -1,4 +1,6 @@
-function solve(prob::AbstractSteadyStateProblem,alg::SteadyStateDiffEqAlgorithm,args...;abstol=1e-8,kwargs...)
+function DiffEqBase.__solve(prob::DiffEqBase.AbstractSteadyStateProblem,
+                            alg::SteadyStateDiffEqAlgorithm,args...;
+                            abstol=1e-8,kwargs...)
 
   if prob.mass_matrix != I
     error("This solver is not able to use mass matrices.")
@@ -32,15 +34,17 @@ function solve(prob::AbstractSteadyStateProblem,alg::SteadyStateDiffEqAlgorithm,
     u = alg.nlsolve(f!,u0,abstol)
     resid = similar(u)
     f!(resid,u)
-    build_solution(prob,alg,u,resid;retcode = :Success)
+    DiffEqBase.build_solution(prob,alg,u,resid;retcode = :Success)
   else
     error("Algorithm not recognized")
   end
 end
 
-function solve(prob::AbstractSteadyStateProblem,alg::DynamicSS,args...;kwargs...)
-  _prob = ODEProblem(prob.f,prob.u0,(0.0,Inf),prob.p,
-                   mass_matrix=prob.mass_matrix,
-                   jac_prototype=prob.jac_prototype)
-  solve(_prob,alg.alg,args...;kwargs...,callback=TerminateSteadyState(alg.abstol,alg.reltol))
+function DiffEqBase.__solve(prob::DiffEqBase.AbstractSteadyStateProblem,
+                            alg::DynamicSS,args...;kwargs...)
+
+  _prob = remake(prob;tspan=(0.0,Inf))
+
+  solve(_prob,alg.alg,args...;kwargs...,
+        callback=TerminateSteadyState(alg.abstol,alg.reltol))
 end
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,5 +1,5 @@
 using SteadyStateDiffEq, DiffEqBase, NLsolve, Sundials
-using Base.Test
+using Test
 
 function f(du,u,p,t)
   du[1] = 2 - 2u[1]
@@ -17,7 +17,7 @@ f(du,sol.u,nothing,0)
 
 prob = ODEProblem(f,u0,(0.0,1.0))
 prob = SteadyStateProblem(prob)
-sol = solve(prob,SSRootfind(nlsolve = (f,u0,abstol) -> (res=NLsolve.nlsolve(f,u0,autodiff=true,method=:newton,iterations=Int(1e6),ftol=abstol);res.zero) ))
+sol = solve(prob,SSRootfind(nlsolve = (f,u0,abstol) -> (res=NLsolve.nlsolve(f,u0,autodiff=:forward,method=:newton,iterations=Int(1e6),ftol=abstol);res.zero) ))
 
 f(du,sol.u,nothing,0)
 @test du == [0,0]
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ language: julia @@
     os:
       - linux
     julia:
-      - 0.6
+      - 0.7
       - nightly
     matrix:
       allow_failures:
@@ Expand Down @@