[Utilities] add operate for ScalarNonlinearFunction (#2215)

jump-dev · Jun 22, 2023 · 39374a1 · 39374a1
1 parent f05632e
commit 39374a1
Show file tree

Hide file tree

Showing 3 changed files with 220 additions and 46 deletions.
diff --git a/src/Utilities/functions.jl b/src/Utilities/functions.jl
@@ -1292,39 +1292,6 @@ function map_terms!(
  return
 end
 
-###################################### +/- #####################################
-
-### ScalarNonlinearFunction
-
-function operate(
- ::typeof(-),
- ::Type{T},
- f::MOI.ScalarNonlinearFunction,
-) where {T}
- if f.head == :- && length(f.args) == 1
- # A simplification for -(-(f)) into f, but only if f is an SNF.
- if f.args[1] isa MOI.ScalarNonlinearFunction
- return f.args[1]
- end
- end
- return MOI.ScalarNonlinearFunction(:-, Any[f])
-end
-
-function operate(
- op::Union{typeof(+),typeof(-),typeof(*),typeof(/)},
- ::Type{T},
- f::MOI.ScalarNonlinearFunction,
- g::Union{
- T,
- MOI.VariableIndex,
- MOI.ScalarAffineFunction{T},
- MOI.ScalarQuadraticFunction{T},
- MOI.ScalarNonlinearFunction,
- },
-) where {T}
- return MOI.ScalarNonlinearFunction(Symbol(op), Any[f, g])
-end
-
 ### Base methods
 
 _eltype(args::Tuple) = _eltype(first(args), Base.tail(args))

diff --git a/src/Utilities/operate.jl b/src/Utilities/operate.jl
@@ -156,6 +156,45 @@ function operate(
  return operate!(+, T, copy(f), g)
 end
 
+function operate(
+ ::typeof(+),
+ ::Type{T},
+ f::MOI.ScalarNonlinearFunction,
+ g::Union{
+ T,
+ MOI.VariableIndex,
+ MOI.ScalarAffineFunction{T},
+ MOI.ScalarQuadraticFunction{T},
+ MOI.ScalarNonlinearFunction,
+ },
+) where {T}
+ return MOI.ScalarNonlinearFunction(:+, Any[f, g])
+end
+
+function operate(
+ ::typeof(+),
+ ::Type{T},
+ f::Union{
+ T,
+ MOI.VariableIndex,
+ MOI.ScalarAffineFunction{T},
+ MOI.ScalarQuadraticFunction{T},
+ MOI.ScalarNonlinearFunction,
+ },
+ g::MOI.ScalarNonlinearFunction,
+) where {T}
+ return MOI.ScalarNonlinearFunction(:+, Any[f, g])
+end
+
+function operate(
+ ::typeof(+),
+ ::Type{T},
+ f::MOI.ScalarNonlinearFunction,
+ g::MOI.ScalarNonlinearFunction,
+) where {T}
+ return MOI.ScalarNonlinearFunction(:+, Any[f, g])
+end
+
 function operate(
  ::typeof(+),
  ::Type{T},
@@ -276,6 +315,20 @@ function operate(
  return operate_coefficients(-, f)
 end
 
+function operate(
+ ::typeof(-),
+ ::Type{T},
+ f::MOI.ScalarNonlinearFunction,
+) where {T}
+ if f.head == :- && length(f.args) == 1
+ # A simplification for -(-(f)) into f, but only if f is an SNF.
+ if f.args[1] isa MOI.ScalarNonlinearFunction
+ return f.args[1]
+ end
+ end
+ return MOI.ScalarNonlinearFunction(:-, Any[f])
+end
+
 ### 2b: operate(::typeof(-), ::Type{T}, ::F1, ::F2)
 
 function operate(
@@ -352,6 +405,45 @@ function operate(
  return operate!(-, T, copy(f), g)
 end
 
+function operate(
+ ::typeof(-),
+ ::Type{T},
+ f::MOI.ScalarNonlinearFunction,
+ g::Union{
+ T,
+ MOI.VariableIndex,
+ MOI.ScalarAffineFunction{T},
+ MOI.ScalarQuadraticFunction{T},
+ MOI.ScalarNonlinearFunction,
+ },
+) where {T}
+ return MOI.ScalarNonlinearFunction(:-, Any[f, g])
+end
+
+function operate(
+ ::typeof(-),
+ ::Type{T},
+ f::Union{
+ T,
+ MOI.VariableIndex,
+ MOI.ScalarAffineFunction{T},
+ MOI.ScalarQuadraticFunction{T},
+ MOI.ScalarNonlinearFunction,
+ },
+ g::MOI.ScalarNonlinearFunction,
+) where {T}
+ return MOI.ScalarNonlinearFunction(:-, Any[f, g])
+end
+
+function operate(
+ ::typeof(-),
+ ::Type{T},
+ f::MOI.ScalarNonlinearFunction,
+ g::MOI.ScalarNonlinearFunction,
+) where {T}
+ return MOI.ScalarNonlinearFunction(:-, Any[f, g])
+end
+
 function operate(
  ::typeof(-),
  ::Type{T},
@@ -471,6 +563,15 @@ function operate(
  return operate!(*, T, copy(g), f)
 end
 
+function operate(
+ ::typeof(*),
+ ::Type{T},
+ f::T,
+ g::MOI.ScalarNonlinearFunction,
+) where {T}
+ return MOI.ScalarNonlinearFunction(:*, Any[f, g])
+end
+
 ### 3b: operate(::typeof(*), ::Type{T}, ::F, ::T)
 
 function operate(
@@ -489,6 +590,15 @@ function operate(
  return operate(*, T, g, f)
 end
 
+function operate(
+ ::typeof(*),
+ ::Type{T},
+ f::MOI.ScalarNonlinearFunction,
+ g::T,
+) where {T}
+ return MOI.ScalarNonlinearFunction(:*, Any[f, g])
+end
+
 ### 3c: operate(::typeof(*), ::Type{T}, ::F1, ::F2)
 
 function operate(
@@ -652,6 +762,15 @@ function operate(
  return operate!(/, T, copy(f), g)
 end
 
+function operate(
+ ::typeof(/),
+ ::Type{T},
+ f::MOI.ScalarNonlinearFunction,
+ g::T,
+) where {T}
+ return MOI.ScalarNonlinearFunction(:/, Any[f, g])
+end
+
 ### 5a: operate(::typeof(vcat), ::Type{T}, ::F...)
 
 function operate(
@@ -786,6 +905,25 @@ function operate!(
  return MA.operate!(+, f, g)
 end
 
+function operate!(
+ ::typeof(+),
+ ::Type{T},
+ f::MOI.ScalarNonlinearFunction,
+ g::Union{
+ T,
+ MOI.VariableIndex,
+ MOI.ScalarAffineFunction{T},
+ MOI.ScalarQuadraticFunction{T},
+ MOI.ScalarNonlinearFunction,
+ },
+) where {T}
+ if f.head == :+
+ push!(f.args, g)
+ return f
+ end
+ return operate(+, T, f, g)
+end
+
 function operate!(
  ::typeof(+),
  ::Type{T},
@@ -992,6 +1130,19 @@ function operate!(
  return f
 end
 
+function operate!(
+ ::typeof(*),
+ ::Type{T},
+ f::MOI.ScalarNonlinearFunction,
+ g::T,
+) where {T}
+ if f.head == :*
+ push!(f.args, g)
+ return f
+ end
+ return operate(*, T, f, g)
+end
+
 function operate!(
  ::typeof(*),
  ::Type{T},