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

HARK 2.0 pre-alpha/code for BST notebook and dashboard #1055

Open
wants to merge 179 commits into
base: master
Choose a base branch
from
Open

HARK 2.0 pre-alpha/code for BST notebook and dashboard #1055

Show file tree
Hide file tree
Changes from 177 commits
Commits
Show all changes
179 commits
Select commit Hold shift + click to select a range
7ff10c9
Should work after moving Ex to ConsumerSolution
llorracc Mar 31, 2021
1ff940c
Before changing Stg to _0_
llorracc Apr 9, 2021
be545e4
Before replacing mNrmMinNow with mNrmMin
llorracc Apr 9, 2021
6f9466e
Seems to work
llorracc Apr 11, 2021
014d470
Seems to work; further cleanup is next
llorracc Apr 11, 2021
a088ed2
Before replacing soln_stge with curr
llorracc Apr 12, 2021
e73e110
Works - Before nexting
llorracc Apr 12, 2021
1656dce
CRRA is both current and next; not allowed to be time varying
llorracc Apr 12, 2021
a7c7f02
Before removing nows
llorracc Apr 13, 2021
9f8c719
After removing Now
llorracc Apr 13, 2021
416fc65
Before replacing stg_cur.Nxt with stg_Nxt
llorracc Apr 14, 2021
77032c8
Comment out checks of passed equal next values
llorracc Apr 15, 2021
5853259
Mostly comments in ConsIndShockModel.py
llorracc Apr 16, 2021
dc4d61d
Incorporate edits to core.py
llorracc Apr 16, 2021
284488b
cleanup
llorracc Apr 16, 2021
f1db161
Eliminate duplication between IndShockSetup and PerfForesightSetup
llorracc Apr 16, 2021
8e87f32
Before DiscFacEff -> DiscFacLiv
llorracc Apr 17, 2021
ec090cb
Before self.stg_crt.Nxt -> Nxt
llorracc Apr 17, 2021
220e119
Fixed OneState starting point
llorracc Apr 18, 2021
1ff5c86
Runs without stopping
llorracc Apr 19, 2021
5fc410c
Works after fixing recursion problems
llorracc Apr 19, 2021
3d74c5c
Before __fcts to __fcts
llorracc Apr 20, 2021
324c876
During Econ-ARK meeting w Mridul Seb
llorracc Apr 22, 2021
d7db77c
Before changing Nxt to stg_crt
llorracc Apr 22, 2021
0ad31f8
Before moving fcts to Nxt
llorracc Apr 24, 2021
cc0979a
stg_Nxt -> stg_futre
llorracc Apr 25, 2021
b20f228
Finally seems to work -- but slows as it runs
llorracc Apr 26, 2021
157b1a9
Fixed speed problems; cleanup
llorracc Apr 27, 2021
f347581
Before Ths -> tp1
llorracc Apr 27, 2021
5a0dcb7
Before moving check_* to PF
llorracc Apr 27, 2021
17b0791
Moved checks to ConsumerSolutionOneStateCRRA - seems to work (!)
llorracc Apr 27, 2021
7cd1c97
Works after fixing check_conditions mystery bug
llorracc Apr 28, 2021
1704e7b
Works; need to put agent params on sol
llorracc Apr 28, 2021
033fa7a
Works: After moving update to AgentTypePlus
llorracc Apr 28, 2021
b09001d
Before Ex_ -> Ex.
llorracc Apr 29, 2021
7c09968
core.py changes to review with Seb
llorracc Apr 30, 2021
4a7064c
Before Seb core.py reviw
llorracc Apr 30, 2021
b69392d
Hand-merge some files from master
llorracc May 2, 2021
29e4308
Add logging stuff back in
llorracc May 2, 2021
665bc3d
Fixed accidental deepcopy preservation of entire recursive history of…
llorracc May 3, 2021
b1da40a
Fix PF LiqConstr model
llorracc May 5, 2021
feb488f
Delete TransPars
llorracc May 5, 2021
2042515
Ignore .spyderproject files
llorracc May 5, 2021
1fae8ca
Ignore .spyderproject files
llorracc May 5, 2021
0758d44
Fix .gitignore spyproject
llorracc May 5, 2021
01c8de6
All of BST works
llorracc May 8, 2021
998fad2
Works before fix of scsr and futr
llorracc May 9, 2021
fff080a
Works; only PF has _tp1
llorracc May 9, 2021
b59bd8d
Everything works; AM before HR
llorracc May 13, 2021
59e52d8
Works; remove unnecessary inits
llorracc May 20, 2021
9dffbac
Everything except PF works
llorracc May 24, 2021
c503abc
Before splitting ConsIndShockModel into -Solvers and -Agents
llorracc May 24, 2021
b085abb
ConsIndShockModel -> Agents, Solve, Both
llorracc May 24, 2021
569af51
Everything works except PF, which needs restructuring to match non-PF…
llorracc May 27, 2021
0d0b200
soln_crnt.bilt does not have Ex methods on it
llorracc May 28, 2021
db8c8b2
Restore versions from 20210527-1311h
llorracc May 28, 2021
8e7a736
Fixed soln_crnt.bilt problem by brute force
llorracc May 28, 2021
2d042c1
Forgot to add _Solve.py
llorracc May 28, 2021
5ed7ef1
WORKS: Fixed bilt problem (using _Agent, _Solve); now restore _AgentD…
llorracc May 28, 2021
2f7a9c4
Works with _AgentSolve, _AgentDicts, _AgentTypes
llorracc May 28, 2021
22c981d
spyproject ignore
llorracc May 28, 2021
e870881
delete spyproject
llorracc May 28, 2021
d3ebd21
Before removing _ConsPerfForesight addfacts
llorracc May 28, 2021
ad4d14e
Rename OneStateConsumerType to consumer_onestate_nobequest
llorracc May 29, 2021
81629d2
Works. Cleanup reached AgentTypes line 1125
llorracc May 30, 2021
3a3c18d
Works: _plus for init_idiosyncratic_shocks
llorracc May 30, 2021
c68bf28
Works: Finished _AgentTypes cleanup
llorracc May 30, 2021
706ce7b
Works: Reverted AgentDicts to use regular dicts
llorracc May 30, 2021
6d2c919
Works: removed some empties from variable list
llorracc May 30, 2021
d9c6eb9
Works: Before pruning bilt
llorracc May 31, 2021
e218de0
Works: bilt only in one place (?)
llorracc Jun 2, 2021
e5f616f
Works: Minor cleanup
llorracc Jun 3, 2021
c117905
Debugging with Mridul
llorracc Jun 4, 2021
23faf6e
Works: Revamped PF liquidity constraint solution
llorracc Jun 7, 2021
490bee9
Replace "self.func" with "self.vNvrsFunc" in interpolation.py
llorracc Jun 11, 2021
df6ccc0
Delete junk
llorracc Jun 11, 2021
1ca79e5
Works: WIP on liquidity constrained value func
llorracc Jun 11, 2021
e1c3e94
Works: ConsPerfForesightSolverEOP(ConsumerSolutionOneStateCRRA) inste…
llorracc Jun 12, 2021
d5363db
Works: After realizing lambda must be used instead of partial()
llorracc Jun 13, 2021
408955b
Works: Before replacing vPfunc and vPPfunc with vFunc.dm and vFunc.dm.dm
llorracc Jun 13, 2021
ac8af1e
Works: Before replacing vPP etc
llorracc Jun 13, 2021
799febd
Works: Before removing _tp1
llorracc Jun 14, 2021
4b98739
Works: Split EGM step from setup of problems in ConsIndShockSolverBas…
llorracc Jun 14, 2021
eb06f01
Putting dm on E now works
llorracc Jun 17, 2021
01c1fc9
Works with revamped E.v_tp1
llorracc Jun 18, 2021
1e521a6
E.v_tp1 => E_t.v_tp1
llorracc Jun 18, 2021
c1d209c
E.v_tp1 => E_t.v_tp1
llorracc Jun 18, 2021
5788bec
Works: After fixing tranShkMin = 1
llorracc Jun 19, 2021
1250e23
Works: Cleaned up
llorracc Jun 22, 2021
c5c406f
Works: Remove add_vFunc etc
llorracc Jun 22, 2021
915d593
Works: Remove add_vFunc etc
llorracc Jun 22, 2021
560bd8c
Works: Move KinkedRsolver to separate file; other cleanup
llorracc Jun 22, 2021
dd3c1b6
Works: Before trying to move E_t_ to E_t.
llorracc Jun 22, 2021
0aec2b8
Works: Get CRRA_tp1 from vFunc_tp1
llorracc Jun 22, 2021
183c038
Works: After moving soln_crnt.bilt.E_t to soln_crnt.E_t
llorracc Jun 22, 2021
ce6dcb9
Works: Remove Inv_E_t
llorracc Jun 22, 2021
9dcbb67
Works: Redid lambdas
llorracc Jun 22, 2021
e43bba8
Works: First stab at transition equations
llorracc Jun 23, 2021
5c2edaa
Works: After renaming to distinguish which shocks are being anticipated
llorracc Jun 24, 2021
55ccc88
Works: cleanup
llorracc Jun 24, 2021
ab1b469
Works: more cleanup; reduce folw
llorracc Jun 24, 2021
652a075
Works: bilt -> Bilt
llorracc Jun 24, 2021
b6064e9
Works: pars -> Pars
llorracc Jun 24, 2021
e77cfb4
Works: Removed building of _tp1 from recursive
llorracc Jun 24, 2021
ef7d6f9
Before creating HARK-Development branch
llorracc Jun 25, 2021
64884c4
Works: After building Modl.value
llorracc Jun 30, 2021
9ba4366
Works: After adding eqns_source to Model_HARK.value
llorracc Jun 30, 2021
0d3eb45
Works: Starting to update rewards
llorracc Jun 30, 2021
83dfeaf
Works: Added utility functions to Modl
llorracc Jun 30, 2021
d8b79ff
Works: (Prior "Works" did not): Add u to Bilt
llorracc Jun 30, 2021
90dd60d
Works: post_to_ante transition
llorracc Jul 1, 2021
a1db6a6
Works: Capitalize Transits
llorracc Jul 1, 2021
a22b80c
Works: Three transitions withing problem
llorracc Jul 1, 2021
d182666
Works: Post HARK call cleanup
llorracc Jul 1, 2021
d5f3db8
Works: Remove vFunc from root
llorracc Jul 1, 2021
4bdcfb1
Works: Remove a lot of dead comments
llorracc Jul 1, 2021
c077e50
Works: After failed attempt to add methods to type
llorracc Jul 2, 2021
716ebf3
Works: Move verbose to AgentTypePlus
llorracc Jul 2, 2021
e921415
Works: Before E_t -> E_t_
llorracc Jul 3, 2021
f7994b9
Works: After adding Nexpectations and Prospectations
llorracc Jul 3, 2021
372bd5e
Works except for PF; Transitions is now dict
llorracc Jul 6, 2021
894c6ba
Works except PF; cleaned up transitions
llorracc Jul 6, 2021
51ddf0e
Works: Added EOP to E_tp1
llorracc Jul 7, 2021
f2c1277
Works: Updating divert to ConsIndShock
llorracc Jul 7, 2021
c14bbf0
Works: After simplifying EGM
llorracc Jul 8, 2021
c94557b
Works: Before subbing E_tp1 into solve_prepared PF
llorracc Jul 8, 2021
aa44369
Works: Before removing EOP from PerfForesightSolver
llorracc Jul 9, 2021
71b71e9
Works: Remove EOP-> non-EOP diversion
llorracc Jul 9, 2021
cc20192
Works: Before py-autopep8
llorracc Jul 9, 2021
83778e6
Works: Before breaking up make_cFunc_PF
llorracc Jul 9, 2021
0252151
Works: After partial breakup of make_cFunc_PF
llorracc Jul 9, 2021
0aa1f2a
Works: After commeting out old make_cFunc_PF stuff that has been moved
llorracc Jul 9, 2021
80c597e
Works: Working on fixing PF liq constr
llorracc Jul 9, 2021
9e0cc0d
Works: After some PF cleanup
llorracc Jul 11, 2021
40800a4
Works: Forget about constructing vFunc level for PF model
llorracc Jul 11, 2021
dbbdf98
Works: Generic define_transition
llorracc Jul 15, 2021
1201d04
Works: With pycharm
llorracc Jul 15, 2021
31ffb2c
Works: Use generic transit rather than handcrafted
llorracc Jul 15, 2021
ff124ba
Works: Still to do: Make BOP work
llorracc Jul 16, 2021
591ad05
Works: After cleanup of Both
llorracc Jul 16, 2021
d2b9ade
Works: Minor tweaks
llorracc Jul 16, 2021
5b407b8
works: Before PyCharm reformat
llorracc Jul 16, 2021
75c31a4
Works: Cleanup of output needed
llorracc Jul 19, 2021
a1d8a25
Works: BST nb with new check_conditions etc -- now needs cleanup
llorracc Jul 20, 2021
7924bd9
Works: Before new PyCharm project
llorracc Jul 21, 2021
3d74ac7
Works: After fixing growth fig
llorracc Jul 23, 2021
8e3d499
Cleanup; fix problems resetting aXtraGrid etc
Jul 24, 2021
3c56c06
Works: Minor cleanup before trying replacement of crnt and futr
llorracc Jul 27, 2021
a3d6945
Works: Before redoing rename of soln stge futr crnt etc
llorracc Jul 27, 2021
68ed717
Works: Replace .soln_crnt with solution_current
llorracc Jul 27, 2021
a35407a
Works: replaced soln_crnt with crnt where appropriate
llorracc Jul 27, 2021
383e519
Works: Replaced futr with folw
llorracc Jul 27, 2021
cf5933d
Works: Replace stge with soln widely.
llorracc Jul 27, 2021
c6fc1ad
Works: Before agent_solution -> agent_stage_solution
llorracc Jul 27, 2021
a913c28
Works: Cleanup of core.py
llorracc Jul 27, 2021
ddc5d40
Works: Removed CommonDefs in favor of _Both
llorracc Jul 27, 2021
1aaf17b
Works: Comment out old dicts from _Both
llorracc Jul 28, 2021
281679b
Works: Cleanup AgentDicts
llorracc Jul 28, 2021
67ecc68
Works: Further cleanup; before pycharm
llorracc Jul 28, 2021
3bdc1c7
Works: Enough with the pycharm and spyder cleanup
llorracc Jul 28, 2021
923281a
Merge branch 'Fix-aXtraGrid' into Update-0p11-for-QE
llorracc Jul 28, 2021
70e8002
Cleanup before public post
llorracc Jul 29, 2021
c28e254
Further cleanup pre-PR
llorracc Jul 29, 2021
0928054
Update ConsumptionSaving/tests/test_IndShockConsumerType.py to match …
llorracc Jul 29, 2021
e45eb56
Works: Added ConsRiskyAssset and tests therefor
llorracc Jul 30, 2021
06d9ce8
Trial version to Mridul
llorracc Jul 31, 2021
a270660
Works with dashboard
llorracc Aug 2, 2021
7f66918
Works for both notebook and dashboard; version to Mridul (?)
llorracc Aug 2, 2021
b71528b
Add ConsRiskyContribModel
llorracc Aug 3, 2021
062d882
Minor cleanup before merge
llorracc Aug 3, 2021
5d49efc
Fix gitignore
llorracc Aug 3, 2021
bef5ba5
git merge master
llorracc Aug 4, 2021
abc4511
Minor cleanup; merge a few things from master
llorracc Aug 4, 2021
47a560e
remove spyder files
MridulS Aug 5, 2021
41c0436
clean up sphinx
MridulS Aug 5, 2021
26bfbb5
more sphinx cleanup
MridulS Aug 5, 2021
2ad0bc8
add back index.rst files
MridulS Aug 5, 2021
59e9c63
Fix bug in AgentSolve
llorracc Sep 7, 2021
3ba91db
Add more LaTeX definitions to utilities.py
llorracc Sep 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Documentation/reference/ConsumptionSaving/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ Consumption Saving
ConsPrefShochModel
ConsRepAgentModel
TractableBufferStockModel

1 change: 1 addition & 0 deletions Documentation/reference/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ Models
:maxdepth: 3

ConsumptionSaving/index

Loading