Merge pull request #3026 from SciML/myb/generic

Make has_time_domain and get_time_domain more generic

Author: YingboMa

src/clock.jl

@@ -33,6 +33,7 @@ function is_continuous_domain(x)
     !has_discrete_domain(x) && has_continuous_domain(x)
 end
 
+get_time_domain(_, x) = get_time_domain(x)
 function get_time_domain(x)
     if iscall(x) && operation(x) isa Operator
         output_timedomain(x)
@@ -42,6 +43,7 @@ function get_time_domain(x)
 end
 get_time_domain(x::Num) = get_time_domain(value(x))
 
+has_time_domain(_, x) = has_time_domain(x)
 """
     has_time_domain(x)
 

src/discretedomain.jl

@@ -241,25 +241,25 @@ end
 Return the time-domain type (`Continuous` or `InferredDiscrete`) that `op` results in.
 """
 function output_timedomain(s::Shift, arg = nothing)
-    if has_time_domain(arg)
-        return get_time_domain(arg)
+    if has_time_domain(t, arg)
+        return get_time_domain(t, arg)
     end
     InferredDiscrete
 end
 
-input_timedomain(::Sample, arg = nothing) = Continuous
-output_timedomain(s::Sample, arg = nothing) = s.clock
+input_timedomain(::Sample, _ = nothing) = Continuous
+output_timedomain(s::Sample, _ = nothing) = s.clock
 
 function input_timedomain(h::Hold, arg = nothing)
     if has_time_domain(arg)
         return get_time_domain(arg)
     end
     InferredDiscrete # the Hold accepts any discrete
 end
-output_timedomain(::Hold, arg = nothing) = Continuous
+output_timedomain(::Hold, _ = nothing) = Continuous
 
-sampletime(op::Sample, arg = nothing) = sampletime(op.clock)
-sampletime(op::ShiftIndex, arg = nothing) = sampletime(op.clock)
+sampletime(op::Sample, _ = nothing) = sampletime(op.clock)
+sampletime(op::ShiftIndex, _ = nothing) = sampletime(op.clock)
 
 changes_domain(op) = isoperator(op, Union{Sample, Hold})
 

src/systems/clock_inference.jl

@@ -12,7 +12,7 @@ function ClockInference(ts::TransformationState)
     var_domain = TimeDomain[Continuous for _ in 1:ndsts(graph)]
     inferred = BitSet()
     for (i, v) in enumerate(get_fullvars(ts))
-        d = get_time_domain(v)
+        d = get_time_domain(ts, v)
         if is_concrete_time_domain(d)
             push!(inferred, i)
             var_domain[i] = d