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.

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

Remove "Now" from model variables #936

Merged
merged 6 commits into from
Feb 8, 2021
Merged

Conversation

sbenthall
Copy link
Contributor

@sbenthall sbenthall commented Jan 29, 2021

This PR removes "Now" from all the model variables in ConsumptionSaving

This builds on #935 , which should be merged first, as that regularizes the MrkvNow attribute into a Mrkv model variable and requires some code changes.

This is main search and replace of key terms.

I've only touched the model variable names represented as strings, not the python variable names, which I see as covered by #907, a separate issue. With one exception: millRule takes its argument names from a dictionary of var names, and so I had to adjust these functions.

One thing I haven't yet done in this PR is test to see if the examples/ still work after this PR. I forget if our automated tests catch errors in those. I expect to do a pass on the examples for issue #488 but may not get to it for a while.

We should make testing the examples/ a part of the release procedure if we don't have them as part of automated tests.

  • Tests for new functionality/models or Tests to reproduce the bug-fix in code.
  • Updated documentation of features that add new functionality.
  • Update CHANGELOG.md with major/minor changes.

@@ -1863,7 +1875,7 @@ def __init__(self, agents=None, tolerance=0.0001, act_T=1200, **kwds):
Market.__init__(
self,
agents=agents,
reap_vars=["aLvlNow", "pLvlNow"],
reap_vars=['aLvl', 'pLvl'],
track_vars=["MaggNow", "AaggNow"],
Copy link
Contributor Author

Choose a reason for hiding this comment

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

These variables should be renamed

@sbenthall
Copy link
Contributor Author

Fix MaggNow and AaggNow. Then finalize PR and merge.

@sbenthall sbenthall mentioned this pull request Feb 7, 2021
3 tasks
@sbenthall
Copy link
Contributor Author

Punting on MaggNow and AaggNow to #942
Testing the examples/ I'm seeing a lot of failures, only some of them have to do with this PR.
I'll merge this PR and work on repairing the examples next as a high priority item.

@sbenthall sbenthall merged commit f880be6 into econ-ark:master Feb 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant