Skip to content

Bug hotfixes #27

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Bug hotfixes #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22f29ac
round utility function for diverse consumption
AndrewRWilliams Jul 18, 2023
bf80c5b
constrain savings to [0, 0.4] and reformat
AndrewRWilliams Jul 18, 2023
36d4b36
update requirements
AndrewRWilliams Jul 18, 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
6 changes: 4 additions & 2 deletions region_yamls/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ _RICE_CONSTANT:
xa_2: 0.00236 # in CAP Eq 6
xa_3: 2 # in CAP Eq 6
xdelta_K: 0.1 # in CAP Eq 9 param discribe the depreciate of the capital
xalpha: 1.45 # Utility function param
xalpha: 0.01 # Utility function param, TODO calibrate for trade, current value is hotfix
xrho: 0.015 # discount factor of the utility
xL_0: 7403 # in POP population at the staring point
xL_a: 11500 # in POP the expected population at convergence
Expand All @@ -57,4 +57,6 @@ _RICE_CONSTANT:

xT_AT_0: 0.85 # in CAP a part of damage function initial condition
xT_LO_0: 0.0068 # in CAP a part of damage function initial condition
xK_0: 223 # in CAP initial condition for capital
xK_0: 223 # in CAP initial condition for capital

max_savings: 0.4
7 changes: 6 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,16 @@ tensorflow==1.13.1
torch==1.9.0
# optional: RLlib and WarpDrive for training
# For CPU
# ray[rllib]==1.0.0
ray[rllib]==1.0.0
# For GPU
# rl-warp-drive==1.7.0
matplotlib==3.5.3
scikit-learn
numpy==1.21.6
deepdiff==5.8.1
pyyaml==6.0
graphviz>=0.13
networkx[default]>=2.6
spacy>=3.0
asttokens>=2.0.1
executing>=0.3.1
Loading