-
Notifications
You must be signed in to change notification settings - Fork 22
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
fix: correct code generation for cases involving multiple dimensions that resolve to same family #588
Merged
Conversation
This file contains 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
…ble accessed by alias dimensions
…amples to function docs
…s and gen-equation-{c,js} Also update a few gen-equation tests to account for removal of normalizeSubscripts
… in some existing tests
…LAY3 function impl
…ltiple dimensions resolve to the same family
…xpandedRefIdsForVar
…ions resolve to the same family when generating equation code
…ndled differently
…case from issue 85
Merged
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 #179 (multiple subscripts that resolve to same family)
Fixes #278 (multi-dimensional variable accessed by aliased dimensions)
Fixes #85 (SUM loop involving same dimension both marked and unmarked)
This fixes a number of long-standing issues related to accessing multi-dimensional variables with subscripts or dimensions that map to the same family. It corrects some issues that we've had to work around for a number of years in En-ROADS and C-ROADS, and also addresses the issues affecting the model in discussion #557.
The changes improve the way multiple dimensions are handled in general, and we now have a more consistent approach to resolving multi-dimensional variable references in both the read equations and code generation phases.
There are more details in the individual issues linked above, but you can see this comment in #179 for the summary.