Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Utilities] add operate for ScalarNonlinearFunction #2215

Merged
merged 2 commits into from
Jun 22, 2023
Merged

[Utilities] add operate for ScalarNonlinearFunction #2215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a12e765
[Utilities] add operate for ScalarNonlinearFunction
odow Jun 21, 2023
5920bdd
Fix formatting
odow Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions src/Utilities/functions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
151 changes: 151 additions & 0 deletions src/Utilities/operate.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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},
Expand Down Expand Up @@ -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(
Expand All @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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},
Expand Down Expand Up @@ -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},
Expand Down
Loading