Further revision and edits to the model descriptions #294
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
Contributor
iworld1991
commented
May 25, 2019
iworld1991
commented
- spelled out briefs like EOS
- explained what GHH preference accomplishes and includes reference
- more details on a few terms such as uncertainty shocks, etc.
- corrected a few typos
* Improvements to checkConditions that were reverted, ref #175. * Fix the factor calculations according to the other reverted commit! * s/impatiance/impatience * Name the number the determines if FVAC is met FVAF instead of FVAC for Factor. * Don't print the table information twice. * More control over warnings and information about impatience conditions.
* Fixed imports in model files All of the consumption-saving model files used a style of import that didn't work when the file was run directly (rather than called as a module), even though they have a __main__ block (and main() function). This has now been fixed. Also mostly removed extraneous file RepAgentModel.py, which seems to be an old name of ConsRepAgentModel.py. This file now simply imports all of ConsRepAgentModel and warns the user to use that instead. * import ConsumerParameters -> import HARK.ConsumptionSaving.ConsumerParameters
* Fixed imports in model files All of the consumption-saving model files used a style of import that didn't work when the file was run directly (rather than called as a module), even though they have a __main__ block (and main() function). This has now been fixed. Also mostly removed extraneous file RepAgentModel.py, which seems to be an old name of ConsRepAgentModel.py. This file now simply imports all of ConsRepAgentModel and warns the user to use that instead. * import ConsumerParameters -> import HARK.ConsumptionSaving.ConsumerParameters
@mnwhite this seems to be wrong, right? I don't see any `self.constructIncomeProcess`-ish statements, so it appears that the mean one log-normal equiprobably version is hard-coded. Correct? I think we should remove the statement unless I missed something in the code, and if it's a *planned* feature, let's just open an issue.
Remove incorrect statement in updateIncomeProcess
The MPC is calculated and stored as an attribute (MPCnow) in some models, but this was omitted in ConsGenIncProcessModel. As it turns out, this functionality is necessary for an exercise/notebook that is being prepared for NBER SI.
NanBool introduced
One line break in a PR I merged in was invalid in Python 2.7, should now be fixed.
Co-Authored-By: shaunagm <[email protected]>
Add CONTRIBUTING.md file to HARK repository
…aster (and more accurate).
…instead, as these will automatically reset upon exit.
Delete stuff called old
set numpy floating point error level to ignore.
We have two folders inside of /ConsumptionSaving that contain model demos. To my knowledge, all of these have been turned into DemARK notebooks other than TryAlternativeParameters, which has no explanation or documentation. I'm not even sure when or why it was put into HARK. This commit removes these old files.
* Changed hardcoded updateAFunc parameters into proper parameters Four parameters that govern how CobbDouglasEconomy.updateAFunc works were defined locally, within the method, but are now attributes to be assigned at init (or at least before the user tries to solve): - update_weight --> DampingFac, now defined complementarily - verbose --> verbose - discard_periods --> T_discard - max_loops --> max_loops To prevent this from being a breaking change, init method writes old hardcoded values if omitted from passed inputs. This will be improved with a warning later. Untested, as it turns out Anaconda3 is incorrectly installed on this computer. * Tested de-hardcoded AFunc updating parameters Put new parameters in dictionaries in ConsumerParameters.py. Also added necessary lines to MarkovCobbDouglasEconomy and fixed one output description.
Make calcChoiceProbs more accurate, and make simultaneous evaluation faster (and more accurate)
…sts run on Travis. (#245)
* DCEGM * Add small test. * Fix test * dcegmIntervals -> dcegmSegments * Add convenience index in dcegmSegments instead. * Some cleanup. * Fix tests. * Fix tests.
* Update some text in dcegm As per our discussion, these were some of the small things Matt had spotted. @shaunagm * Update dcegm.py
IndShockConsumerType.__init__ was calling its checkConditions method, but this caused many subclasses to fail, as their checkConditions method either throws a notImplementedError or runs into an attribute error. CDC wants checkConditions called automatically, so this is now done in preSolve(). All subclasses have had a trivial preSolve method added, which only calls updateSolutionTerminal.
Delinting at PyCon created a typo in the argument list for Market, now fixed.
Simple test of initialization of IncomeDstn of IndShockConsumerType.
Gauss Hermite-based normal and lognormal quadrature nodes and weights
Somehow the non-delinted version of HARK.core (from before PyCon) ended up in this branch. This commit simply reverts it.
Chris and I discovered that HARK.parallel.multithreadCommands did not work on some of our project code... but only in some Python environments. On Windows, I could only generate this error on Python 3, but everything worked correctly on Python 2. On Mac and/or Linux, Chris found that the error came up when running Python in a terminal, but not when running Spyder; he also tested various web servers. After some digging, Chris found that recent versions of joblib (which multithreadCommands uses) changed the default backend of joblib from multiprocessing to loky. Apparently something in loky does not play nicely with our class structure, as it can't (de)serialize at least some AgentType subclasses. This fixes the issue by simply changing the backend argument on the call to Parallel. It also fixes one typo in a comment.
Add non_empty argument validator
Prepare release 0.10.0.dev3
Remove invalid characters that break pypi uploading
* Move two test files from Testing to HARK/tests. * Remove MultithreadedDemo.py * Use assertAlmostEqual in the reference test in file test_TractableBufferStockModel.py. * Fix inputs for MarkovConsumerType. Lacked T_cycle, LivPrb didn't match the number of states, and MrkvArray wasn't an array although it was time-varying. * Compare vectors properly. * Compare vectors properly. * Update test_modelcomparisons.py * Update test_modelcomparisons.py * Update test_modelcomparisons.py * Fix MrkvArray
|
Tao,
Thanks for your work on this.
But, looking at the PR online, it looks like you need to redo the PR after
merging in to iworld1991's fork the new development version of econ-ark,
which we (quietly) released last week? That seems like it must be the
reason there are changes in so many files?
…On Sat, May 25, 2019 at 4:34 PM Tao ***@***.***> wrote:
- spelled out briefs like EOS
- explained what GHH preference accomplishes and includes reference
- more details on a few terms such as uncertainty shocks, etc.
- corrected a few typos
------------------------------
You can view, comment on, or merge this pull request online at:
#294
Commit Summary
- NanBool introduced
- update after comments
- update after comments
- Restore fixes from discarded master (#219)
- Improvements to checkConditions that were reverted, ref #175. (#205)
- Fixed imports in model files (#224)
- Merge #224 did not bring in the final version (#225)
- Remove Chinese Growth and NonDurables since these now exist as
DemARKs. (#229)
- Add mentions of DemARK and REMARK in README.md (#230)
- Remove incorrect statement in updateIncomeProcess
- Merge pull request #231 from pkofod/patch-2
- Add MPC to simulation in ConsGenIncProcessModel (#170)
- Merge pull request #193 from TimMunday/NanBool
- Create CONTRIBUTING.md
- Fix one line break
- Apply minor language edits from @lloracc
- Merge pull request #233 from shaunagm/master
- Undo nan_bool merge (#236)
- set numpy floating point error level to ignore.
- Delete stuff called old
- Make calcChoiceProbs more accurate, and make simultaneous evalution
faster (and more accurate).
- Move the seterr statement to solve and simulate and use error states
instead, as these will automatically reset upon exit.
- Merge pull request #239 from econ-ark/Remove-Old-Stuff
- Merge pull request #238 from pkofod/numpyfloatingpointerror
- Delete old demo files (#243)
- Changed hardcoded updateAFunc parameters into proper parameters
(#244)
- Merge pull request #242 from pkofod/logsumprobaccuracy
- Remove old Testing-folder file because it's already covered by the
tests run on Travis. (#245)
- [RFC] Include DCEGM main function in HARK (#226)
- Update some text in dcegm (#248)
- Prepare release 0.10.0.dev1
- Merge pull request #249 from shaunagm/release-updates
- Suppress annoying impatience check when not needed
- Merge branch 'master' of https://github.com/econ-ark/HARK
- Fix verbosity check in ConsIndShockModel
- Merge pull request #250 from econ-ark/Fix-verbose-check-error
- Prepare release 0.10.0.dev2
- Merge pull request #251 from shaunagm/prepare-release-0.10.0.dev2
- Add a comment to the construction of aNrmNow
- Test initialization of IndShockConsumerType.
- Merge pull request #254 from pkofod/patch-5
- Introduce approxNormal and approxLognormalGaussHermite and two
helper functions for converting between location and scale in
normal<->lognormal.
- Add missing
- names.
- Allow user to chose parameter specification as lognormal or normal
parameters.
- simpler mu, sigma no-op.
- Use std instead of var.
- Partial update to README for PyCon (#257)
- Remove parametersAs and add tests.
- add self to vars from setUp().
- Further updates to README.md (#260)
- Add Flake8 to requirements, setup, and travis
- Merge branch 'master' into gausherm
- Merge branch 'master' into asimpletest
- add version dunder in init
- Merge pull request #265 from MridulS/master
- updated readme with installation fixes
- Merge branch 'master' of https://github.com/econ-ark/HARK
- Merge pull request #266 from aawalker9/master
- Merge branch 'master' into add-flake8
- Merge pull request #261 from shaunagm/add-flake8
- Add vim swap files to .gitignore
- Modify hyperlinks to use relative links feature from GitHub
- Merge branch 'master' into
PyCon2019/no-issue/modify-readme-contributing-link
- Merge pull request #270 from
tanyaschlusser/PyCon2019/no-issue/modify-readme-contributing-link
- Merge branch 'master' into gitignore-vim
- Merge pull request #269 from keithblaha/gitignore-vim
- Add "Learning HARK" section to README
- linted Comparison and Model Tests
- changed econ-arc to econ-ark
- Merge pull request #274 from StephenSchroeder/master
- lint MultithreadDemo.py and TractableBuffer~.py
- Merge branch 'master' into README-Add-Learning-HARK
- Linted the Core.py file to make some changes
- Merge pull request #276 from rsaavy/master
- lint HARK\test directory and ConsAggShockModel.py
- Simple lint edits commits for dcegm.py
- Merge branch 'master' into master
- Merge pull request #278 from rsaavy/master
- Merge branch 'master' into README-Add-Learning-HARK
- Merge branch 'master' into master
- Merge pull request #277 from StephenSchroeder/master
- Merge branch 'master' into README-Add-Learning-HARK
- Lint and fix lambda function
- Merge branch 'master' of https://github.com/econ-ark/HARK
- Add non_empty argument validator
- Merge pull request #281 from StephenSchroeder/master
- Merge branch 'master' into README-Add-Learning-HARK
- Merge pull request #272 from econ-ark/README-Add-Learning-HARK
- Moved checkConditions out of init (#284)
- Merge branch 'master' into asimpletest
- Merge branch 'master' into gausherm
- Fix typo in Market.__init__ (#286)
- Merge branch 'master' into gausherm
- Merge branch 'master' into asimpletest
- Merge pull request #256 from pkofod/asimpletest
- Merge branch 'master' into gausherm
- Merge pull request #258 from pkofod/gausherm
- Fixes multithreading problem from ipython kernel
- Revert HARK.core to previous commit
- Merge pull request #287 from econ-ark/Multithreading-fix-maybe
- Merge branch 'master' into validators
- Merge pull request #282 from keithblaha/validators
- Prepare release 0.10.0.dev3
- Merge pull request #288 from shaunagm/prepare-release-0.10.0.dev3
- Remove invalid characters that break pypi uploading
- Merge pull request #289 from econ-ark/hotfix-dev3-release
- replace Q with Question
- Move two test files from Testing to HARK/tests. (#255)
- add model description
- Merge branch 'master' of https://github.com/econ-ark/HARK into
BayerLuetticke
- upstream pull
- revised the model description
- uncertainty shocks explained
File Changes
- *M* .gitignore
<https://github.com/econ-ark/HARK/pull/294/files#diff-0> (10)
- *M* .travis.yml
<https://github.com/econ-ark/HARK/pull/294/files#diff-1> (1)
- *A* CHANGES.md
<https://github.com/econ-ark/HARK/pull/294/files#diff-2> (75)
- *A* CONTRIBUTING.md
<https://github.com/econ-ark/HARK/pull/294/files#diff-3> (38)
- *M* HARK/BayerLuetticke/TwoAsset.ipynb
<https://github.com/econ-ark/HARK/pull/294/files#diff-4> (39)
- *M* HARK/ConsumptionSaving/ConsAggShockModel.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-5> (742)
- *M* HARK/ConsumptionSaving/ConsGenIncProcessModel.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-6> (529)
- *M* HARK/ConsumptionSaving/ConsIndShockModel.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-7> (198)
- *D*
HARK/ConsumptionSaving/ConsIndShockModelDemos/TryAlternativeParameterValues.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-8> (42)
- *D* HARK/ConsumptionSaving/ConsIndShockModelDemos/__init__.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-9> (0)
- *M* HARK/ConsumptionSaving/ConsMarkovModel.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-10> (17)
- *M* HARK/ConsumptionSaving/ConsMedModel.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-11> (14)
- *M* HARK/ConsumptionSaving/ConsPrefShockModel.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-12> (16)
- *M* HARK/ConsumptionSaving/ConsRepAgentModel.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-13> (10)
- *M* HARK/ConsumptionSaving/ConsumerParameters.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-14> (10)
- *D* HARK/ConsumptionSaving/Demos/Chinese_Growth.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-15> (297)
- *D*
HARK/ConsumptionSaving/Demos/NonDurables_During_Great_Recession.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-16> (230)
- *M* HARK/ConsumptionSaving/RepAgentModel.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-17> (387)
- *M* HARK/ConsumptionSaving/TractableBufferStockModel.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-18> (2)
- *M* HARK/__init__.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-19> (2)
- *M* HARK/core.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-20> (421)
- *D* HARK/cstwMPC/SetupParamsCSTWold.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-21> (296)
- *D* HARK/cstwMPC/cstwMPCold.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-22> (861)
- *A* HARK/dcegm.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-23> (198)
- *M* HARK/interpolation.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-24> (39)
- *M* HARK/parallel.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-25> (4)
- *A* HARK/tests/test_ConsIndShockInit.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-26> (25)
- *R* HARK/tests/test_HARKutilities.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-27> (28)
- *A* HARK/tests/test_TractableBufferStockModel.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-28> (59)
- *A* HARK/tests/test_approxDstns.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-29> (26)
- *A* HARK/tests/test_dcegm.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-30> (49)
- *A* HARK/tests/test_modelcomparisons.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-31> (151)
- *A* HARK/tests/test_validators.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-32> (38)
- *M* HARK/utilities.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-33> (27)
- *A* HARK/validators.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-34> (35)
- *M* MANIFEST.in
<https://github.com/econ-ark/HARK/pull/294/files#diff-35> (2)
- *M* README.md
<https://github.com/econ-ark/HARK/pull/294/files#diff-36> (445)
- *D* Testing/Comparison_UnitTests.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-37> (165)
- *D* Testing/HARKutilities_UnitTests.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-38> (68)
- *M* Testing/ModelTesting.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-39> (122)
- *D* Testing/MultithreadDemo.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-40> (91)
- *D* Testing/TractableBufferStockModel_UnitTests.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-41> (64)
- *M* requirements.txt
<https://github.com/econ-ark/HARK/pull/294/files#diff-42> (2)
- *M* setup.cfg
<https://github.com/econ-ark/HARK/pull/294/files#diff-43> (4)
- *M* setup.py
<https://github.com/econ-ark/HARK/pull/294/files#diff-44> (5)
Patch Links:
- https://github.com/econ-ark/HARK/pull/294.patch
- https://github.com/econ-ark/HARK/pull/294.diff
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#294?email_source=notifications&email_token=AAKCK73NGNLQO2EJQLSU7UTPXGPFLA5CNFSM4HPVK5B2YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4GV3SJFQ>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAKCK74X56MFHXUYJ53CU2TPXGPFLANCNFSM4HPVK5BQ>
.
--
- Chris Carroll
|
|
I confused master branch and Bayerluetticke branch in my fork, which caused the issue above. I will make a new pull request. |
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.