Merge pull request #222 from JuliaDiffEq/myb/muladd

Add `conj` as a special case and add promotion rule

Author: YingboMa

Diff for: Project.toml

@@ -1,7 +1,7 @@
 name = "ModelingToolkit"
 uuid = "961ee093-0014-501f-94e3-6117800e7a78"
 authors = ["Chris Rackauckas <[email protected]>"]
-version = "1.1.2"
+version = "1.1.3"
 
 [deps]
 DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"

Diff for: src/function_registration.jl

@@ -56,5 +56,6 @@ end
 Base.:^(x::Expression,y::T) where T <: Integer = Operation(Base.:^, Expression[x, y])
 Base.:^(x::Expression,y::T) where T <: Rational = Operation(Base.:^, Expression[x, y])
 
+@register Base.conj(x)
 @register Base.getindex(x,i)
 Base.getindex(x::Operation,i::Int64) = Operation(getindex,[x,i])

Diff for: src/operations.jl

@@ -66,3 +66,7 @@ Operation(x) = convert(Operation, x)
 #convert to Expr
 Base.Expr(op::Operation) = simplified_expr(op)
 Base.convert(::Type{Expr},x::Operation) = Expr(x)
+
+# promotion
+Base.promote_rule(::Type{<:Constant}, ::Type{<:Operation}) = Operation
+Base.promote_rule(::Type{<:Operation}, ::Type{<:Constant}) = Operation

Diff for: test/direct.jl

@@ -81,3 +81,7 @@ function test_worldage()
    f_iip(out,[1.0,2,3])
 end
 test_worldage()
+
+@test_nowarn muladd(x, y, ModelingToolkit.Constant(0))
+@test promote(x, ModelingToolkit.Constant(0)) == (x, identity(0))
+@test_nowarn [x, y, z]'