Rewrite core.relax_integer_vars transformation
#3586
Merged
+381
−40
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mrmundt
reviewed
May 1, 2025
…o into modernize-relax-integer-vars
mrmundt
approved these changes
May 13, 2025
jsiirola
reviewed
Jun 17, 2025
| doc=""" | ||
| This argument should be the reverse transformation token | ||
| returned by a previous call to this transformation to transform | ||
| fixed disjunctive state in the given model. |
There was a problem hiding this comment.
copy/paste error: disjunctive -> discrete
|
|
||
| def _apply_to(self, model, **kwds): | ||
| options = kwds.pop('options', {}) | ||
| if kwds.get('undo', options.get('undo', False)): | ||
| if not model.ctype in (Block, Disjunct): |
There was a problem hiding this comment.
This test differs slightly from the error message. Do you mean if model.ctype not in SubclassOf(Block):?
Comment on lines
+184
to
+194
| for b in block.component_data_objects(Block, active=None, descend_into=True): | ||
| if not b.active: | ||
| if config.transform_deactivated_blocks: | ||
| deprecation_warning( | ||
| "The `transform_deactivated_blocks` arguments is deprecated. " | ||
| "Either specify deactivated Blocks as targets to activate them " | ||
| "if transforming them is the desired behavior.", | ||
| version='6.9.3.dev0', | ||
| ) | ||
| else: | ||
| continue |
There was a problem hiding this comment.
Some questions:
- Why descend only over
Blockwhen you acceptBlockandDisjunctas targets? Should this becomponent_data_objects(SubclassOf(Block), ...? - Why test for
activeinside the loop? Wouldn't it be easier toactive = None if config.transform_deactivated_blocks else True? Is the idea to only issue the deprecation warning if model actually had a deactivated block?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes # .
Summary/Motivation:
This rewrites the
core.relax_integer_varstransformation, modernizing it to our more recent transformation conventions. In particular, it:undoargument in favor of implementingreverseaccording to the design we introduced in Adding (reversible)gdp.transform_current_disjunctive_logictransformation #2809.targetsargumentcomponent_data_objects(Var)Changes proposed in this PR:
core.relax_integer_varstransformationVarCollectorenum to distinguish getting Vars from active expressions vs. usingcomponent_data_objects(Var). Naming suggestions are welcome here...Legal Acknowledgement
By contributing to this software project, I have read the contribution guide and agree to the following terms and conditions for my contribution: