We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 4f9312d commit de800dbCopy full SHA for de800db
src/Blocks/Blocks.jl
@@ -3,7 +3,7 @@ The module `Blocks` contains common input-output components, referred to as bloc
3
"""
4
module Blocks
5
using ModelingToolkit, Symbolics
6
-using IfElse: ifelse
+import IfElse: ifelse
7
import ..@symcheck
8
using ModelingToolkit: getdefault
9
src/Blocks/sources.jl
@@ -511,9 +511,10 @@ Base.isless(y::Number, x::Parameter) = Base.isless(y, x.ref)
511
512
Base.copy(x::Parameter{T}) where {T} = Parameter{T}(copy(x.data), x.ref)
513
514
-Base.ifelse(c::Bool, x::Parameter, y::Parameter) = ifelse(c, x.ref, y.ref)
515
-Base.ifelse(c::Bool, x::Parameter, y::Number) = ifelse(c, x.ref, y)
516
-Base.ifelse(c::Bool, x::Number, y::Parameter) = ifelse(c, x, y.ref)
+ifelse(c::Bool, x::Parameter, y::Parameter) = ifelse(c, x.ref, y.ref)
+ifelse(c::Bool, x::Parameter, y::Number) = ifelse(c, x.ref, y)
+ifelse(c::Bool, x::Number, y::Parameter) = ifelse(c, x, y.ref)
517
+
518
Base.max(x::Number, y::Parameter) = max(x, y.ref)
519
Base.max(x::Parameter, y::Number) = max(x.ref, y)
520
Base.max(x::Parameter, y::Parameter) = max(x.ref, y.ref)
0 commit comments