Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: expand variables allowing for any number of indices in EXCEPT clause #118

Merged
merged 18 commits into from
Sep 27, 2021
Merged

fix: expand variables allowing for any number of indices in EXCEPT clause #118

merged 18 commits into from
Sep 27, 2021

Conversation

ToddFincannon
Copy link
Collaborator

@ToddFincannon ToddFincannon commented Sep 22, 2021 •
edited by chrispcampbell
Loading

Fixes #117.

See #117 for details.

@ToddFincannon
add DELAY FIXED function with test model
92b7105
@ToddFincannon
set initial value in data buffer before delay time reached
994b172
@ToddFincannon
emit FIXED DELAY as a level with special support data
1b6c443
@ToddFincannon
set init and eval references for the DELAY FIXED var
00011fc
@ToddFincannon
add subscripts to FixedDelay support vars when LHS subscripts used
4eec5c0
@ToddFincannon
run prettier on source files
1ea5ed1
@ToddFincannon
fix: allow extra index subscripts in 2D const lists
179fa4a
@ToddFincannon
remove some obsolete Ramda usage
b6f0236
@ToddFincannon
generalize visitSubscriptList to any number of dimensions
dc64817
@ToddFincannon
get direct data offset from the separated dimension
8525113
@ToddFincannon
convert consts split from data equations into data variables
fb5c149
@ToddFincannon
add some comments
3263bdb
@ToddFincannon
change generated lookup to cover the entire x axis
59b17ea
@ToddFincannon
allow e and E in exponents in cdbl
ca96bec
@ToddFincannon
expand separated vars on any number of subscripts
bc4d67c
@ToddFincannon ToddFincannon added this to the 0.6.0 milestone Sep 22, 2021
@chrispcampbell chrispcampbell changed the title Todd/117 except fix: expand separated vars on any number of subscripts Sep 23, 2021
@chrispcampbell chrispcampbell changed the title fix: expand separated vars on any number of subscripts fix: expand separated vars on any number of subscripts (including EXCEPT clause) Sep 24, 2021
Base automatically changed from todd/115-dup-decls to develop September 27, 2021 22:31
chrispcampbell
chrispcampbell approved these changes Sep 27, 2021
View reviewed changes
Copy link
Contributor

@chrispcampbell chrispcampbell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ToddFincannon This looks good to me; nice simplification. The updated except.dat file wasn't included earlier, so I used Vensim to update it and verified that the tests pass. Will merge it shortly.

@chrispcampbell chrispcampbell changed the title fix: expand separated vars on any number of subscripts (including EXCEPT clause) fix: expand variables allowing for any number of indices in EXCEPT clause Sep 27, 2021
@chrispcampbell chrispcampbell merged commit d92343e into develop Sep 27, 2021
@chrispcampbell chrispcampbell deleted the todd/117-except branch September 27, 2021 22:45
@chrispcampbell chrispcampbell mentioned this pull request Oct 12, 2021
Closed
@climateinteractive-bot climateinteractive-bot mentioned this pull request Jun 4, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chrispcampbell chrispcampbell chrispcampbell approved these changes

Assignees
No one assigned
Labels
feature
Projects
None yet
Milestone
0.6.0
Development

Successfully merging this pull request may close these issues.

Allow more than two indices in EXCEPT clauses
2 participants
@ToddFincannon @chrispcampbell