Merge pull request SciML#1 from SciML/master

Rebase
andreasnoack · Mar 29, 2021 · a201053 · a201053
2 parents 7a2b738 + 7fcf8f4
commit a201053
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "SciMLBase"
 uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 authors = ["Chris Rackauckas <[email protected]> and contributors"]
-version = "1.8.6"
+version = "1.9.1"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"

diff --git a/src/SciMLBase.jl b/src/SciMLBase.jl
@@ -528,6 +528,7 @@ include("tabletraits.jl")
 include("remake.jl")
 
 function discretize end
+function symbolic_discretize end
 
 isfunctionwrapper(x) = false
 function wrapfun_oop end
@@ -536,7 +537,7 @@ function unwrap_fw end
 
 export isinplace
 
-export solve, solve!, init, discretize
+export solve, solve!, init, discretize, symbolic_discretize
 
 export LinearProblem, NonlinearProblem, QuadratureProblem, OptimizationProblem
 

diff --git a/src/problems/dde_problems.jl b/src/problems/dde_problems.jl
@@ -77,7 +77,7 @@ end
 function DynamicalDDEProblem(f::DynamicalDDEFunction,h,tspan,p=NullParameters();kwargs...)
   DynamicalDDEProblem(f,h(p,first(tspan))...,h,tspan,p;kwargs...)
 end
-function DynamicalDDEProblem(f1::Function,f2::Function,args...;kwargs...)
+function DynamicalDDEProblem(f1,f2,args...;kwargs...)
   DynamicalDDEProblem(DynamicalDDEFunction(f1,f2),args...;kwargs...)
 end
 
@@ -97,7 +97,7 @@ Define a dynamical DDE problem from the two functions `f1` and `f2`.
 `isinplace` optionally sets whether the function is inplace or not.
 This is determined automatically, but not inferred.
 """
-function DynamicalDDEProblem{iip}(f1::Function,f2::Function,args...;kwargs...) where iip
+function DynamicalDDEProblem{iip}(f1,f2,args...;kwargs...) where iip
   DynamicalDDEProblem(DynamicalDDEFunction{iip}(f1,f2),args...;kwargs...)
 end