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

Fix error message for invalid indicator constraints #3584

Merged
merged 3 commits into from
Nov 27, 2023
Merged

Fix error message for invalid indicator constraints #3584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88ccae4
Fix error message for invalid indicator connstraints
odow Nov 26, 2023
8dc8d41
Fix
odow Nov 26, 2023
7755929
Update test/test_constraint.jl
odow Nov 26, 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
39 changes: 20 additions & 19 deletions src/indicator.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@ function _build_indicator_constraint(
return VectorConstraint([variable, jump_function(constraint)], set)
end

function _build_indicator_constraint(
_error::Function,
lhs::F,
::ScalarConstraint,
::Type{<:MOI.Indicator},
) where {F}
return _error(
"unable to build indicator constraint with the left-hand side term " *
"`($lhs)::$F`. The left-hand side must be a binary decision variable.",
)
end

function _indicator_variable_set(::Function, variable::Symbol)
return variable, MOI.Indicator{MOI.ACTIVATE_ON_ONE}
end
Expand Down Expand Up @@ -51,30 +63,19 @@ function parse_constraint_call(
"Invalid right-hand side `$(rhs)` of indicator constraint. Expected constraint surrounded by `{` and `}`.",
)
end
rhs_con = rhs.args[1]
rhs_vectorized, rhs_parsecode, rhs_buildcall =
parse_constraint(_error, rhs_con)
rhs_vectorized, rhs_parsecode, rhs_build_call =
parse_constraint(_error, rhs.args[1])
if vectorized != rhs_vectorized
_error("Inconsistent use of `.` in symbols to indicate vectorization.")
end
if vectorized
buildcall = :(
_build_indicator_constraint.(
$_error,
$(esc(variable)),
$rhs_buildcall,
$S,
)
)
f, lhs_parse_code = _rewrite_expression(variable)
push!(rhs_parsecode.args, lhs_parse_code)
build_call = if vectorized
:(_build_indicator_constraint.($_error, $f, $rhs_build_call, $S))
else
buildcall = :(_build_indicator_constraint(
$_error,
$(esc(variable)),
$rhs_buildcall,
$S,
))
:(_build_indicator_constraint($_error, $f, $rhs_build_call, $S))
end
return rhs_parsecode, buildcall
return rhs_parsecode, build_call
end

function constraint_string(
Expand Down
10 changes: 10 additions & 0 deletions test/test_constraint.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1783,4 +1783,14 @@ function test_SkipModelConvertScalarSetWrapper()
return
end

function test_indicator_error()
model = Model()
@variable(model, x[1:2])
err = ErrorException(
"In `@constraint(model, x[1] >= 0 --> {x[2] == 0})`: unable to build indicator constraint with the left-hand side term `(x[1] >= 0)::JuMP.NonlinearExpr`. The left-hand side must be a binary decision variable.",
)
@test_throws_strip err @constraint(model, x[1] >= 0 --> {x[2] == 0})
return
end

end # module
Loading