export operator

Author: baggepinnen

src/ModelingToolkit.jl

@@ -268,7 +268,7 @@ export debug_system
 #export Continuous, Discrete, sampletime, input_timedomain, output_timedomain
 #export has_discrete_domain, has_continuous_domain
 #export is_discrete_domain, is_continuous_domain, is_hybrid_domain
-export Sample, Hold, Shift, ShiftIndex, sampletime, SampleTime
+export Sample, Hold, Shift, ShiftIndex, sampletime, SampleTime, ClockChange
 export Clock #, InferredDiscrete,
 
 end # module

src/clock.jl

@@ -55,7 +55,7 @@ See also [`is_discrete_domain`](@ref)
 """
 function has_discrete_domain(x)
     issym(x) && return is_discrete_domain(x)
-    hasshift(x) || hassample(x) || hashold(x)
+    hasshift(x) || hassample(x) || hashold(x) || hasclockchange(x)
 end
 
 """

src/discretedomain.jl

@@ -166,10 +166,10 @@ end
 SymbolicUtils.promote_symtype(::ClockChange, x) = x
 
 function Base.:(==)(D1::ClockChange, D2::ClockChange)
-    isequal(D1.to, D2.to) && isequal(D1.from, D2.from)
+    ==(D1.to, D2.to) && ==(D1.from, D2.from)
 end
 Base.hash(D::ClockChange, u::UInt) = hash(D.from, hash(D.to, xor(u, 0xa5b640d6d952f101)))
-
+hasclockchange(O) = recursive_hasoperator(ClockChange, unwrap(O))
 # ShiftIndex
 
 """

src/systems/clock_inference.jl

@@ -250,9 +250,10 @@ function generate_discrete_affect(
         cont_to_disc_obs = build_explicit_observed_function(
             use_index_cache ? osys : syss[continuous_id],
             needed_cont_to_disc_obs,
-            throw = false,
+            throw = true,
             expression = true,
             output_type = SVector)
+
         disc_to_cont_obs = build_explicit_observed_function(sys, needed_disc_to_cont_obs,
             throw = false,
             expression = true,

src/systems/discrete_system/discrete_system.jl

@@ -139,7 +139,8 @@ function DiscreteSystem(eqs::AbstractVector{<:Equation}, iv, dvs, ps;
     iv′ = value(iv)
     dvs′ = value.(dvs)
     ps′ = value.(ps)
-    if any(hasderiv, eqs) || any(hashold, eqs) || any(hassample, eqs) || any(hasdiff, eqs)
+    if any(hasderiv, eqs) || any(hashold, eqs) || any(hassample, eqs) ||
+       any(hasdiff, eqs) || any(hasclockchange, eqs)
         error("Equations in a `DiscreteSystem` can only have `Shift` operators.")
     end
     if !(isempty(default_u0) && isempty(default_p))