Add parse_constraint_expr and parse_constraint_head #2228

blegat · 2020-04-22T07:03:48Z

This PR continues #2051. We avoid breaking the parse_constraint API. We might consider renaming parse_constraint in parse_call_constraint and parse_constraint_head in parse_constraint but this might be breaking. We can consider this renaming just before we plan to release JuMP v0.22 or v1.0.
Allow parsing of non-:call expressions in @constraint.
@dourouc05 Could you provide an example use case for this ?
This is point 1) of #2051 (comment)

Wikunia · 2020-04-22T12:35:50Z

This would allow to have constraints like:

@constraint(m, b := {x >= y})

which was a possible syntax for the reified constraint.

One can implement:

function JuMP.parse_constraint_head(_error::Function, ::Val{:(:=)}, ls, rs)

in that case which wasn't possible before with the parse_constraint function itself as far as I know.

codecov · 2020-04-29T16:25:53Z

Codecov Report

Merging #2228 into master will decrease coverage by 0.01%.
The diff coverage is 90.90%.

@@            Coverage Diff             @@
##           master    #2228      +/-   ##
==========================================
- Coverage   91.17%   91.16%   -0.02%     
==========================================
  Files          42       42              
  Lines        4159     4165       +6     
==========================================
+ Hits         3792     3797       +5     
- Misses        367      368       +1

Impacted Files	Coverage Δ
src/macros.jl	`92.52% <90.00%> (-0.14%)`	⬇️
src/indicator.jl	`96.00% <100.00%> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ef902fe...a6f7948. Read the comment docs.

@blegat

Add support for reification. Things moved to https://github.com/dourouc05/JuCP.jl Update macros.jl Pass the same type of argument to the different calls to parsefun. Restore two definitions of parse_constraint to avoid ambiguity. LoadError: LoadError: MethodError: parse_constraint(::JuMP.var"#_error#70"{Symbol}, ::Symbol, ::Symbol, ::Expr, ::Symbol, ::Symbol) is ambiguous. Candidates: parse_constraint(_error::Function, sense::Symbol, args...) in JuMP at C:\Users\Thibaut\.julia\dev\JuMP\src\macros.jl:180 parse_constraint(_error::Function, lb, lsign::Symbol, aff, rsign::Symbol, ub) in JuMP at C:\Users\Thibaut\.julia\dev\JuMP\src\macros.jl:205 Implement more closely @blegat's suggestion. Also adapt build_constraint. Also adapt indicator constraints. Also adapt SD constraint. For :call constraint, dispatch on the first argument. Clean up. Make tests pass. Useless extension point. Allow rewriting the rhs of a comparison constraint. Bug fixing (due to MA?). Don't break user code. If the constraint looks like `== f(x)`, whatever f or x, the previous code would always think the function f must be known by JuMP. Reduce diff size. @blegat's comments. Simplify PR wrt jump-dev#2228. Simplify PR wrt jump-dev#2228. Clean PR wrt jump-dev#2229.

@blegat

Add support for reification. Things moved to https://github.com/dourouc05/JuCP.jl Update macros.jl Pass the same type of argument to the different calls to parsefun. Restore two definitions of parse_constraint to avoid ambiguity. LoadError: LoadError: MethodError: parse_constraint(::JuMP.var"#_error#70"{Symbol}, ::Symbol, ::Symbol, ::Expr, ::Symbol, ::Symbol) is ambiguous. Candidates: parse_constraint(_error::Function, sense::Symbol, args...) in JuMP at C:\Users\Thibaut\.julia\dev\JuMP\src\macros.jl:180 parse_constraint(_error::Function, lb, lsign::Symbol, aff, rsign::Symbol, ub) in JuMP at C:\Users\Thibaut\.julia\dev\JuMP\src\macros.jl:205 Implement more closely @blegat's suggestion. Also adapt build_constraint. Also adapt indicator constraints. Also adapt SD constraint. For :call constraint, dispatch on the first argument. Clean up. Make tests pass. Useless extension point. Allow rewriting the rhs of a comparison constraint. Bug fixing (due to MA?). Don't break user code. If the constraint looks like `== f(x)`, whatever f or x, the previous code would always think the function f must be known by JuMP. Reduce diff size. @blegat's comments. Simplify PR wrt jump-dev#2228. Simplify PR wrt jump-dev#2228. Clean PR wrt jump-dev#2229.

@blegat

Add support for reification. Things moved to https://github.com/dourouc05/JuCP.jl Update macros.jl Pass the same type of argument to the different calls to parsefun. Restore two definitions of parse_constraint to avoid ambiguity. LoadError: LoadError: MethodError: parse_constraint(::JuMP.var"#_error#70"{Symbol}, ::Symbol, ::Symbol, ::Expr, ::Symbol, ::Symbol) is ambiguous. Candidates: parse_constraint(_error::Function, sense::Symbol, args...) in JuMP at C:\Users\Thibaut\.julia\dev\JuMP\src\macros.jl:180 parse_constraint(_error::Function, lb, lsign::Symbol, aff, rsign::Symbol, ub) in JuMP at C:\Users\Thibaut\.julia\dev\JuMP\src\macros.jl:205 Implement more closely @blegat's suggestion. Also adapt build_constraint. Also adapt indicator constraints. Also adapt SD constraint. For :call constraint, dispatch on the first argument. Clean up. Make tests pass. Useless extension point. Allow rewriting the rhs of a comparison constraint. Bug fixing (due to MA?). Don't break user code. If the constraint looks like `== f(x)`, whatever f or x, the previous code would always think the function f must be known by JuMP. Reduce diff size. @blegat's comments. Simplify PR wrt jump-dev#2228. Simplify PR wrt jump-dev#2228. Clean PR wrt jump-dev#2229.

@blegat

Add support for reification. Things moved to https://github.com/dourouc05/JuCP.jl Update macros.jl Pass the same type of argument to the different calls to parsefun. Restore two definitions of parse_constraint to avoid ambiguity. LoadError: LoadError: MethodError: parse_constraint(::JuMP.var"#_error#70"{Symbol}, ::Symbol, ::Symbol, ::Expr, ::Symbol, ::Symbol) is ambiguous. Candidates: parse_constraint(_error::Function, sense::Symbol, args...) in JuMP at C:\Users\Thibaut\.julia\dev\JuMP\src\macros.jl:180 parse_constraint(_error::Function, lb, lsign::Symbol, aff, rsign::Symbol, ub) in JuMP at C:\Users\Thibaut\.julia\dev\JuMP\src\macros.jl:205 Implement more closely @blegat's suggestion. Also adapt build_constraint. Also adapt indicator constraints. Also adapt SD constraint. For :call constraint, dispatch on the first argument. Clean up. Make tests pass. Useless extension point. Allow rewriting the rhs of a comparison constraint. Bug fixing (due to MA?). Don't break user code. If the constraint looks like `== f(x)`, whatever f or x, the previous code would always think the function f must be known by JuMP. Reduce diff size. @blegat's comments. Simplify PR wrt jump-dev#2228. Simplify PR wrt jump-dev#2228. Clean PR wrt jump-dev#2229.

@blegat

Add support for reification. Things moved to https://github.com/dourouc05/JuCP.jl Update macros.jl Pass the same type of argument to the different calls to parsefun. Restore two definitions of parse_constraint to avoid ambiguity. LoadError: LoadError: MethodError: parse_constraint(::JuMP.var"#_error#70"{Symbol}, ::Symbol, ::Symbol, ::Expr, ::Symbol, ::Symbol) is ambiguous. Candidates: parse_constraint(_error::Function, sense::Symbol, args...) in JuMP at C:\Users\Thibaut\.julia\dev\JuMP\src\macros.jl:180 parse_constraint(_error::Function, lb, lsign::Symbol, aff, rsign::Symbol, ub) in JuMP at C:\Users\Thibaut\.julia\dev\JuMP\src\macros.jl:205 Implement more closely @blegat's suggestion. Also adapt build_constraint. Also adapt indicator constraints. Also adapt SD constraint. For :call constraint, dispatch on the first argument. Clean up. Make tests pass. Useless extension point. Allow rewriting the rhs of a comparison constraint. Bug fixing (due to MA?). Don't break user code. If the constraint looks like `== f(x)`, whatever f or x, the previous code would always think the function f must be known by JuMP. Reduce diff size. @blegat's comments. Simplify PR wrt jump-dev#2228. Simplify PR wrt jump-dev#2228. Clean PR wrt jump-dev#2229.

dourouc05 added a commit to dourouc05/JuMP.jl that referenced this pull request Apr 22, 2020

Simplify PR wrt jump-dev#2228.

40d764d

dourouc05 added a commit to dourouc05/JuMP.jl that referenced this pull request Apr 22, 2020

Simplify PR wrt jump-dev#2228.

1091f19

This was referenced Apr 24, 2020

Add extension points for more generic @constraint syntax #2051

Merged

Improve support for constraint programming #2227

Closed

dourouc05 and others added 2 commits April 29, 2020 14:02

Add parse_constraint_expr and parse_constraint_head

527113a

Add test with :=

a6f7948

blegat force-pushed the bl/constraint_head branch from 6300d61 to a6f7948 Compare April 29, 2020 12:27

blegat merged commit a72e7ac into master May 4, 2020

dourouc05 mentioned this pull request May 4, 2020

Add rewrite_call_expression. #2229

Closed

blegat mentioned this pull request May 5, 2020

Clean up and document parse_constraint #2236

Closed

odow deleted the bl/constraint_head branch May 10, 2020 19:35

blegat added this to the 0.21.3 milestone Jun 17, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add parse_constraint_expr and parse_constraint_head #2228

Add parse_constraint_expr and parse_constraint_head #2228

blegat commented Apr 22, 2020 •

edited

Loading

Wikunia commented Apr 22, 2020

codecov bot commented Apr 29, 2020 •

edited

Loading

Add parse_constraint_expr and parse_constraint_head #2228

Add parse_constraint_expr and parse_constraint_head #2228

Conversation

blegat commented Apr 22, 2020 • edited Loading

Wikunia commented Apr 22, 2020

codecov bot commented Apr 29, 2020 • edited Loading

Codecov Report

blegat commented Apr 22, 2020 •

edited

Loading

codecov bot commented Apr 29, 2020 •

edited

Loading