Merge pull request #1449 from devmotion/dw/ifelse

Remove IfElse.jl

Author: ChrisRackauckas

Project.toml

@@ -16,7 +16,6 @@ DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 DomainSets = "5b8099bc-c8ec-5219-889f-1d9e522a28bf"
 DynamicPolynomials = "7c1d4256-1411-5781-91ec-d7bc3513ac07"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
-IfElse = "615f187c-cbe4-4ef1-ba3b-2fcf58d6d173"
 LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
 Latexify = "23fbe1c1-3f47-55db-b15f-69d7ec21a316"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
@@ -71,7 +70,6 @@ DomainSets = "0.6, 0.7"
 DynamicPolynomials = "0.5, 0.6"
 ForwardDiff = "0.10.36"
 Groebner = "0.8.2, 0.9"
-IfElse = "0.1"
 LaTeXStrings = "1.3"
 LambertW = "1.0.0"
 Latexify = "0.16"

docs/src/manual/functions.md

@@ -103,7 +103,7 @@ differentiated. So for example:
 ```julia
 function derivative(::typeof(min), args::NTuple{2,Any}, ::Val{1})
     x, y = args
-    IfElse.ifelse(x < y, one(x), zero(x))
+    ifelse(x < y, one(x), zero(x))
 end
 ```
 

docs/src/manual/variables.md

@@ -71,10 +71,9 @@ This will work for any floating-point input, as well as symbolic input.
 
 ## Symbolic Control Flow
 
-Control flow can be expressed in Symbolics.jl in the following ways:
+Control flow can be expressed in Symbolics.jl in the following way:
 
-- `IfElse.ifelse(cond,x,y)`: this is a dispatch-able version of the `ifelse`
-  function provided by `IfElse.jl` which allows for encoding conditionals in
+- `ifelse(cond,x,y)`: this function allows to encode conditionals in
   the symbolic branches.
 
 ## Inspection Functions

src/Symbolics.jl

@@ -38,7 +38,7 @@ import SymbolicUtils.Code: toexpr
 
 import ArrayInterface
 using RuntimeGeneratedFunctions
-using SciMLBase, IfElse
+using SciMLBase
 import MacroTools
 
 using SymbolicIndexingInterface

src/diff.jl

@@ -187,7 +187,7 @@ function executediff(D, arg, simplify=false; occurrences=nothing)
                 executediff(D, a)
             end
         end
-    elseif op === (IfElse.ifelse)
+    elseif op === ifelse
         args = arguments(arg)
         O = op(args[1], 
             executediff(D, args[2], simplify; occurrences=arguments(occurrences)[2]), 
@@ -295,7 +295,7 @@ julia> Dx = Differential(x) # Differentiate wrt x
 (::Differential) (generic function with 2 methods)
 
 julia> dfx = expand_derivatives(Dx(f))
-(k*((2abs(x - y)) / y - 2z)*IfElse.ifelse(signbit(x - y), -1, 1)) / y
+(k*((2abs(x - y)) / y - 2z)*ifelse(signbit(x - y), -1, 1)) / y
 ```
 """
 function expand_derivatives(O::Symbolic, simplify=false)

src/extra_functions.jl

@@ -38,23 +38,23 @@ derivative(::typeof(sign), args::NTuple{1,Any}, ::Val{1}) = 0
 
 @register_symbolic Base.signbit(x)::Bool
 derivative(::typeof(signbit), args::NTuple{1,Any}, ::Val{1}) = 0
-derivative(::typeof(abs), args::NTuple{1,Any}, ::Val{1}) = IfElse.ifelse(signbit(args[1]),-one(args[1]),one(args[1]))
+derivative(::typeof(abs), args::NTuple{1,Any}, ::Val{1}) = ifelse(signbit(args[1]),-one(args[1]),one(args[1]))
 
 function derivative(::typeof(min), args::NTuple{2,Any}, ::Val{1})
     x, y = args
-    IfElse.ifelse(x < y, one(x), zero(x))
+    ifelse(x < y, one(x), zero(x))
 end
 function derivative(::typeof(min), args::NTuple{2,Any}, ::Val{2})
     x, y = args
-    IfElse.ifelse(x < y, zero(y), one(y))
+    ifelse(x < y, zero(y), one(y))
 end
 function derivative(::typeof(max), args::NTuple{2,Any}, ::Val{1})
     x, y = args
-    IfElse.ifelse(x > y, one(x), zero(x))
+    ifelse(x > y, one(x), zero(x))
 end
 function derivative(::typeof(max), args::NTuple{2,Any}, ::Val{2})
     x, y = args
-    IfElse.ifelse(x > y, zero(y), one(y))
+    ifelse(x > y, zero(y), one(y))
 end
 
 @register_symbolic Base.ceil(x)

src/num.jl

@@ -33,7 +33,7 @@ Base.typemin(::Type{Num}) = Num(-Inf)
 Base.typemax(::Type{Num}) = Num(Inf)
 Base.float(x::Num) = x
 
-IfElse.ifelse(x::Num,y,z) = Num(IfElse.ifelse(value(x), value(y), value(z)))
+Base.ifelse(x::Num,y,z) = Num(ifelse(value(x), value(y), value(z)))
 
 Base.promote_rule(::Type{Bool}, ::Type{<:Num}) = Num
 for C in [Complex, Complex{Bool}]

test/diff.jl

@@ -1,6 +1,5 @@
 using Symbolics
 using Test
-using IfElse
 using Symbolics: value
 
 # Derivatives
@@ -255,8 +254,8 @@ expression2 = substitute(expression, Dict(collect(Differential(t).(x) .=> ẋ)))
 @test isequal(expression2, (ẋ[1] + ẋ[2] + ẋ[3] + ẋ[4])*cos(x[1] + x[2] + x[3] + x[4]))
 
 @test isequal(
-    Symbolics.derivative(IfElse.ifelse(signbit(b), b^2, sqrt(b)), b),
-    IfElse.ifelse(signbit(b), 2b,(SymbolicUtils.unstable_pow(2Symbolics.unwrap(sqrt(b)), -1)))
+    Symbolics.derivative(ifelse(signbit(b), b^2, sqrt(b)), b),
+    ifelse(signbit(b), 2b,(SymbolicUtils.unstable_pow(2Symbolics.unwrap(sqrt(b)), -1)))
 )
 
 # Chain rule

test/overloads.jl

@@ -170,7 +170,6 @@ z2 = c + d * im
 
 @test isequal(ℯ^a, exp(a))
 
-using IfElse: ifelse
 @test isequal(Symbolics.derivative(abs(x), x), ifelse(signbit(x), -1, 1))
 @test isequal(Symbolics.derivative(sign(x), x), 0)
 @test isequal(Symbolics.derivative(signbit(x), x), 0)