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

Capitalization #4

Open
wants to merge 47 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
4e7a28b
update requirements
alanlujan91 Jan 2, 2023
70914bd
rerun notebook
alanlujan91 Jan 2, 2023
8aa5704
update source code
alanlujan91 Jan 2, 2023
32c855f
fix discretize
alanlujan91 Jan 20, 2023
2947c52
fix bug
alanlujan91 Jan 20, 2023
50728db
update notebook
alanlujan91 Jan 20, 2023
a4b64cc
fix subscripts
dedwar65 Jan 20, 2023
7975b58
Revert "fix subscripts"
alanlujan91 Jan 23, 2023
f720589
2nd attempt at fixing subscripts
dedwar65 Jan 24, 2023
8893e69
Merge remote-tracking branch 'upstream/master' into updates
alanlujan91 Feb 15, 2023
66f5384
update requirements and run notebook
alanlujan91 Feb 15, 2023
ab0a400
clean up code
alanlujan91 Feb 15, 2023
256295c
changes for update to HARK 0.13.0, including edits to cstwMPC_main.py
sbenthall Feb 16, 2023
3acba49
Merge branch 'master' of github.com:econ-ark/DistributionOfWealthMPC …
sbenthall Feb 16, 2023
3b9282a
Merge remote-tracking branch 'upstream/master' into updates
alanlujan91 Feb 16, 2023
5a6824e
binder prep
camriddell Feb 22, 2023
bdf9bb3
refactoring to fix #2; separate agents module; main takes options dic…
sbenthall Feb 24, 2023
64322d1
Merge branch 'master' into i2
alanlujan91 Mar 1, 2023
1e2552a
Merge pull request #13 from sbenthall/i2
alanlujan91 Mar 1, 2023
f4895ff
Merge remote-tracking branch 'upstream/master' into updates
alanlujan91 Mar 1, 2023
50f687c
update cstwMPC notebook
alanlujan91 Mar 1, 2023
3254124
fix second experiment
alanlujan91 Mar 1, 2023
d8ad983
Merge pull request #11 from camriddell/master
alanlujan91 Mar 1, 2023
33d5d95
Merge remote-tracking branch 'upstream/master' into updates
alanlujan91 Mar 1, 2023
9e4da96
remove superfluous definitions
alanlujan91 Mar 1, 2023
d19129d
Update cstwMPC_MAIN.py
alanlujan91 Mar 1, 2023
efbe930
reproduce via conda
camriddell Mar 2, 2023
64583ac
add estimagic for minimization
alanlujan91 Mar 2, 2023
e456801
some fixes
alanlujan91 Mar 30, 2023
ea95d62
update results
alanlujan91 Apr 4, 2023
3d1923c
rename files
alanlujan91 Apr 5, 2023
ff164e7
update python
alanlujan91 Apr 5, 2023
34a769a
Merge pull request #14 from camriddell/master
alanlujan91 Apr 5, 2023
f3637de
Merge remote-tracking branch 'upstream/master' into updates
alanlujan91 Apr 5, 2023
676016f
Delete settings.json
alanlujan91 Apr 5, 2023
79a305f
clean up code
alanlujan91 Apr 5, 2023
71f2ce0
update estimation and results
alanlujan91 Apr 6, 2023
82f2764
update combo estimation
alanlujan91 Apr 6, 2023
3d7e82f
updates to market agents
alanlujan91 Apr 12, 2023
a350c2d
update results
alanlujan91 Apr 12, 2023
8c8ef20
clean up code
alanlujan91 Apr 12, 2023
a06c0d3
create do_max.py
alanlujan91 Apr 12, 2023
9d0b835
Update cstwMPC.ipynb
alanlujan91 Apr 21, 2023
57d03ea
Merge pull request #4 from alanlujan91/updates
alanlujan91 Apr 21, 2023
7ffc76b
capitalization
alanlujan91 May 5, 2023
46e30d6
Merge pull request #19 from alanlujan91/master
alanlujan91 May 5, 2023
2a71687
capitalization
alanlujan91 May 5, 2023
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
16 changes: 16 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -189,3 +189,19 @@ dmypy.json

# End of https://www.gitignore.io/api/python


.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
!.vscode/*.code-snippets

# Local History for Visual Studio Code
.history/

# Built Visual Studio Code Extensions
*.vsix
condaenv
.idea
.vscode
6 changes: 6 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
repos:
- repo: https://github.com/asottile/pyupgrade
rev: v3.3.1
hooks:
- id: pyupgrade
args: [--py39-plus]
Loading