-
Notifications
You must be signed in to change notification settings - Fork 573
Bugfixes and testing of linear templates #3781
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.
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
Open
jsiirola
wants to merge
51
commits into
Pyomo:main
Choose a base branch
from
jsiirola:linear-template-testing
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
51 commits
Select commit
Hold shift + click to select a range
d7ffc8b
Define InvalidConstraintError for unallowed constraint expressions
jsiirola 6dde46f
Remove check_duplicates from linear template compiler
jsiirola fd28560
When compiling templates, call to_string in everything that is not a …
jsiirola 5b55d91
Catch (and test) bug where TemplateVarRecorder ignored the sorter
jsiirola 1c55286
Avoid awkward call to base class by just reimplementing the method
jsiirola db497ef
Use attempt_import to break circular dependencies
jsiirola 2b5669c
Start tests for repn/linear_template
jsiirola 2c7d772
bugfix: converting LinearTemplateRepn to str
jsiirola 90a0d22
Improve specificity of raised exceptions
jsiirola 9f65886
Fix filter for 0 multipliers/coefs
jsiirola 52a78ac
Correctly handle empty subexpressions (e.g., from 0 multipliers)
jsiirola bb4dd68
Explicitly disallow nonlinear expressions in the LinearTemplateRepn
jsiirola e343628
Use SetOf when iterating over non-Set indexing sets
jsiirola 21a07cf
Rework extract_values to use defaultdict for Params with default values
jsiirola cdeaa7c
SetOf.dimen updates:
jsiirola fad7cb7
Ensure we only attempt to templatize generators
jsiirola e2d6081
Expand summations that do not involve IndexTemplates
jsiirola 55b1252
Improve error reporting
jsiirola 585a7b4
Rework linear_template to enable better unit testing
jsiirola b6bf6b4
Resolve handling of fixed variables in bounds and skipped constraints
jsiirola 72b4eea
Don't unnecessarily expand sparse Params
jsiirola d3a3a24
Improve error
jsiirola 6353b49
Verify absence of bounds for objectives; update comment
jsiirola 3b2da5d
Add interface to get var_list for TemplateVarRecorder
jsiirola edbc4e1
Expand linear_template testing
jsiirola f95ff38
Merge branch 'main' into linear-template-testing
jsiirola c7c5d6f
SetOf: revert change to the dimen of empty iterables
jsiirola ff1f45c
Update tests to reflect use of SetOf; remove deprecation warnings
jsiirola 7e6fb2b
Revert "SetOf: revert change to the dimen of empty iterables"
jsiirola c2b2b92
Track change that SetOf([]).dimen is now None
jsiirola 1a55b4c
SetOf({}).dimen should return UnknownSetDimen
jsiirola f214fec
Merge branch 'main' into linear-template-testing
jsiirola 7641291
Avoid slicing over UnknownSetDimen referenecs
jsiirola ed79074
Explicit sum() should not prevent templatizing constraint
jsiirola f2290a1
Additional validation before creating TemplateSumExpression objects
jsiirola 19f0fe3
Remove (unused) 'remove_fixed_vars' option
jsiirola 1dcf6ff
Remove duplicated code
jsiirola 3d8e302
NFC: fix typo
jsiirola 17d0fcf
Merge branch 'main' into linear-template-testing
jsiirola 1ded1e2
Merge branch 'main' into linear-template-testing
jsiirola 3784328
NFC: Apply black
jsiirola 9645d4c
Catch errors iterating over component values in templates
jsiirola 15a9331
Merge branch 'main' into linear-template-testing
jsiirola 9de6ce3
Address review comments
jsiirola 1e077a8
Merge branch 'main' into linear-template-testing
jsiirola 17ca894
Address review: rename normalize -> standardize
jsiirola e6c0452
Add InvalidExpressionError
jsiirola ad3f920
Raise an InvalidConstraintError and not RuntimeError for non-fixed bo…
jsiirola 9cd7711
Log an informative error for invalid linear template expressions
jsiirola 2231924
NFC: doc update
jsiirola 61bfaf6
Outdated copyright statement
mrmundt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.