Saklad5
/
Bone-Market-Solver
2
0
Fork 0
Code Issues Pull Requests Activity

Create intermediate integer variables for non-constants 

Reusing an intermediate variable causes constraints on the intermediate
to be applied to the original, which can have unintended consequences.
This commit is contained in:
Jeremy Saklad 2022-02-15 09:51:25 -06:00
parent 15317f6298
commit 0a7de36807
Signed by: Jeremy Saklad
GPG Key ID: 9CA2149583EDBF84
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonemarketsolver/objects/bone_market_model.py
View File

@ -104,8 +104,8 @@ Each parameter is interpreted as a BoundedLinearExpression, and a layer of indir
`equality` must be either a LinearExp or a unary partialmethod that accepts a target integer variable and returns Constraints.""" `equality` must be either a LinearExp or a unary partialmethod that accepts a target integer variable and returns Constraints."""
# If expression is either an integer variable with the specified bounds or an integer constant, just pass it through # If expression is an integer constant, just pass it through
if isinstance(expression, cp_model.IntVar) and (lambda domain : domain == [lb, ub] or domain[0] == domain[1])(cp_model.IntVar.Proto(expression).domain): if isinstance(expression, cp_model.IntVar) and (lambda domain : domain[0] == domain[1])(cp_model.IntVar.Proto(expression).domain):
return (expression, ()) return (expression, ())
else: else:
intermediate: Final[cp_model.IntVar] = super().NewIntVar(lb, ub, name) intermediate: Final[cp_model.IntVar] = super().NewIntVar(lb, ub, name)