Merge pull request #928 from isaacsas/promote_tspan_for_discrete_probs

Promote tspan for discrete probs

Author: ChrisRackauckas

src/problems/discrete_problems.jl

@@ -88,7 +88,7 @@ struct DiscreteProblem{uType, tType, isinplace, P, F, K} <:
     """ A callback to be applied to every solver which uses the problem."""
     kwargs::K
     @add_kwonly function DiscreteProblem{iip}(f::AbstractDiscreteFunction{iip},
-            u0, tspan::Tuple, p = NullParameters();
+            u0, tspan, p = NullParameters();
             kwargs...) where {iip}
         _u0 = prepare_initial_state(u0)
         _tspan = promote_tspan(tspan)
@@ -138,12 +138,12 @@ end
 
 Defines a discrete problem with the specified functions.
 """
-function DiscreteProblem(f::AbstractDiscreteFunction, u0, tspan::Tuple,
+function DiscreteProblem(f::AbstractDiscreteFunction, u0, tspan,
         p = NullParameters(); kwargs...)
     DiscreteProblem{isinplace(f)}(f, u0, tspan, p; kwargs...)
 end
 
-function DiscreteProblem(f::Base.Callable, u0, tspan::Tuple, p = NullParameters();
+function DiscreteProblem(f::Base.Callable, u0, tspan, p = NullParameters();
         kwargs...)
     iip = isinplace(f, 4)
     DiscreteProblem(DiscreteFunction{iip}(f), u0, tspan, p; kwargs...)
@@ -154,7 +154,7 @@ $(SIGNATURES)
 
 Define a discrete problem with the identity map.
 """
-function DiscreteProblem(u0::Union{AbstractArray, Number}, tspan::Tuple,
+function DiscreteProblem(u0::Union{AbstractArray, Number}, tspan,
         p = NullParameters(); kwargs...)
     iip = u0 isa AbstractArray
     if iip
@@ -197,6 +197,3 @@ struct DiscreteAliasSpecifier
         end
     end
 end
-
-
-

test/problem_building_test.jl

@@ -72,3 +72,29 @@ prob_bvp = BVProblem(simplependulum!, bc!, [pi / 2, pi / 2], (0, 1.0))
         @test typeof(newprob) == typeof(prob)
     end
 end
+
+# test for tspan promotion in DiscreteProblem
+let
+    p = (0.1 / 1000, 0.01)
+    u₀ = [1.0]
+    tspan = (0.0, 1.0)
+    dprob = DiscreteProblem(u₀, tspan, p)
+    @test dprob.tspan === (0.0, 1.0)
+
+    dprob2 = DiscreteProblem(u₀, 1.0, p)
+    @test dprob.tspan === (0.0, 1.0)
+
+    dprob3 = DiscreteProblem(u₀, [0.0, 1.0], p)
+    @test dprob.tspan === (0.0, 1.0)
+
+    dprob4 = DiscreteProblem{true}(nothing, nothing, p)
+    dprob4b = DiscreteProblem{true}(nothing, nothing)
+    dprob5 = DiscreteProblem{true}(SciMLBase.DISCRETE_INPLACE_DEFAULT, u₀, tspan, p)
+    dprob6 = DiscreteProblem{true}(SciMLBase.DISCRETE_INPLACE_DEFAULT, u₀, tspan)
+    dprob7 = DiscreteProblem{true}((du,u,p,t) -> du[1] = 0, u₀, tspan)
+    @test dprob7.u0 === u₀
+    @test dprob7.tspan === tspan
+    dprob8 = DiscreteProblem{true}(nothing, u₀, tspan)
+    @test dprob8.u0 === u₀
+    @test dprob8.tspan === tspan
+end