Skip to content

Commit 23d9c18

Browse files
committed
Merge branch 'main' into i325
2 parents 44792cd + 585a66f commit 23d9c18

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+8358
-1738
lines changed

.github/workflows/cache.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,22 @@ jobs:
1818
python-version: "3.11"
1919
environment-file: environment.yml
2020
activate-environment: quantecon
21+
- name: graphviz Support # TODO: required?
22+
run: |
23+
sudo apt-get -qq update && sudo apt-get install -y graphviz
24+
- name: Install latex dependencies
25+
run: |
26+
sudo apt-get -qq update
27+
sudo apt-get install -y \
28+
texlive-latex-recommended \
29+
texlive-latex-extra \
30+
texlive-fonts-recommended \
31+
texlive-fonts-extra \
32+
texlive-xetex \
33+
latexmk \
34+
xindy \
35+
dvipng \
36+
cm-super
2137
- name: Build HTML
2238
shell: bash -l {0}
2339
run: |

.github/workflows/ci.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ jobs:
55
runs-on: ubuntu-latest
66
steps:
77
- name: Checkout
8-
uses: actions/checkout@v2
8+
uses: actions/checkout@v4
99
- name: Setup Anaconda
10-
uses: conda-incubator/setup-miniconda@v2
10+
uses: conda-incubator/setup-miniconda@v3
1111
with:
1212
auto-update-conda: true
1313
auto-activate-base: true
@@ -51,6 +51,12 @@ jobs:
5151
jb build lectures --builder pdflatex --path-output ./ -n --keep-going
5252
mkdir -p _build/html/_pdf
5353
cp -u _build/latex/*.pdf _build/html/_pdf
54+
- name: Upload Execution Reports (LaTeX)
55+
uses: actions/upload-artifact@v4
56+
if: failure()
57+
with:
58+
name: execution-reports
59+
path: _build/latex/reports
5460
- name: Build Download Notebooks (sphinx-tojupyter)
5561
shell: bash -l {0}
5662
run: |
@@ -66,13 +72,13 @@ jobs:
6672
rm -r _build/.doctrees
6773
jb build lectures --path-output ./ -nW --keep-going
6874
- name: Upload Execution Reports (HTML)
69-
uses: actions/upload-artifact@v2
75+
uses: actions/upload-artifact@v4
7076
if: failure()
7177
with:
7278
name: execution-reports
7379
path: _build/html/reports
7480
- name: Preview Deploy to Netlify
75-
uses: nwtgck/actions-netlify@v1.1
81+
uses: nwtgck/actions-netlify@v2
7682
with:
7783
publish-dir: '_build/html/'
7884
production-branch: main

README.md

Lines changed: 10 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,16 @@
1-
# lecture-python-intro
1+
# A First Course in Quantitative Economics with Python
22

3-
An undergraduate lecture series for the foundations of computational economics
3+
An Undergraduate Lecture Series for the Foundations of Computational Economics
44

5-
## Content ideas
5+
## Jupyter notebooks
66

7-
Content ideas in no particular order.
7+
Jupyter notebook versions of each lecture are available for download
8+
via the website.
89

9-
Open individual issues and PRs for the ones we decide to add.
10+
## Contributions
1011

11-
1. Geometric Series (existing lecture)
12-
2. Leontief Systems (from Networks Book)
13-
3. Luenberger
14-
4. IO Visualizations (from Networks Book)
15-
5. PyPGM (Eileen Nielson ... Youtube Star)
16-
6. Baby Version of https://python.quantecon.org/re_with_feedback.html (Cagan Model)
17-
7. Baby Version of "unpleasant arithmetic and Friedmans optimal quantity of money"
18-
8. Schelling Segregation Model
19-
9. Solow Model
20-
10. Simulations of Wealth Distribution
21-
11. Baby model of Lake Model (Eigenvalue Extension)
22-
12. Diamond Dybvig Model
23-
13. Moral Harzard - Wallace
24-
14. Philips Curve and Nairu
25-
15. Baby version of the Markov Chain Lecture
26-
16. Baby linear programming lecture
27-
17. Basic Nonlinear Demand and Supply (non-linear solver) OOP lecture
28-
18. Asset Pricing (Harrison/Kreps Model)
29-
19. Two Models of Asset Bubbles
30-
20. cobweb model -- start people thinking about expectations
31-
21. social mobility lecture
32-
22. Baby version of cattle cycles model
33-
23. Bi-matrix games.
34-
24. Shortest path lecture (existing)
35-
25. Pricing an American option
36-
26. Baby version of LLN / CLT lecture --- less maths, more simulation, all in one dimension
37-
27. Baby version of heavy tails lecture
38-
30. Lecture on solving linear equations and matrix algebra
39-
31. Lecture on eigenvalues, Perron-Frobenius and the Neumann series lemma
40-
32. Overlapping generations
12+
To comment on the lectures please add to or open an issue in the issue tracker (see above).
4113

42-
Get Tom's network intermediary paper.
14+
We welcome pull requests!
15+
16+
Please read the [QuantEcon style guide](https://manual.quantecon.org/intro.html) first, so that you can match our style.

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ channels:
44
- conda-forge
55
dependencies:
66
- python=3.11
7-
- anaconda=2023.09
7+
- anaconda=2024.02
88
- pip
99
- pip:
1010
- jupyter-book==0.15.1

lectures/_config.yml

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,19 @@ latex:
3535
targetname: quantecon-python-intro.tex
3636

3737
sphinx:
38-
extra_extensions: [sphinx_multitoc_numbering, sphinxext.rediraffe, sphinx_exercise, sphinx_togglebutton, sphinx_proof, sphinx_tojupyter]
38+
extra_extensions: [sphinx_multitoc_numbering, sphinxext.rediraffe, sphinx_exercise, sphinx_togglebutton, sphinx.ext.intersphinx, sphinx_proof, sphinx_tojupyter]
3939
config:
40+
bibtex_reference_style: author_year
4041
# false-positive links
41-
linkcheck_ignore: ['https://doi.org/https://doi.org/10.2307/1235116']
42+
linkcheck_ignore: ['https://doi.org/https://doi.org/10.2307/1235116', 'https://math.stackexchange.com/*', 'https://stackoverflow.com/*']
4243
# myst-nb config
4344
nb_render_image_options:
4445
width: 80%
46+
nb_code_prompt_show: "Show {type}"
47+
suppress_warnings: [mystnb.unknown_mime_type, myst.domains]
48+
# -------------
49+
html_js_files:
50+
- https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.4/require.min.js
4551
html_favicon: _static/lectures-favicon.ico
4652
html_theme: quantecon_book_theme
4753
html_static_path: ['_static']
@@ -62,12 +68,37 @@ sphinx:
6268
description: This website presents introductory lectures on computational economics, designed and written by Thomas J. Sargent and John Stachurski.
6369
keywords: Python, QuantEcon, Quantitative Economics, Economics, Sloan, Alfred P. Sloan Foundation, Tom J. Sargent, John Stachurski
6470
analytics:
65-
google_analytics_id: G-1P39P53YM9
71+
google_analytics_id: G-QDS1YRJNGM
6672
launch_buttons:
6773
notebook_interface : classic # The interface interactive links will activate ["classic", "jupyterlab"]
6874
binderhub_url : https://mybinder.org # The URL of the BinderHub (e.g., https://mybinder.org)
6975
colab_url : https://colab.research.google.com
7076
thebe : false # Add a thebe button to pages (requires the repository to run on Binder)
77+
intersphinx_mapping:
78+
pyprog:
79+
- https://python-programming.quantecon.org/
80+
- null
81+
intro:
82+
- https://intro.quantecon.org/
83+
- null
84+
dle:
85+
- https://quantecon.github.io/lecture-dle/
86+
- null
87+
dps:
88+
- https://quantecon.github.io/lecture-dps/
89+
- null
90+
eqm:
91+
- https://quantecon.github.io/lecture-eqm/
92+
- null
93+
stats:
94+
- https://quantecon.github.io/lecture-stats/
95+
- null
96+
tools:
97+
- https://quantecon.github.io/lecture-tools-techniques/
98+
- null
99+
dynam:
100+
- https://quantecon.github.io/lecture-dynamics/
101+
- null
71102
mathjax3_config:
72103
tex:
73104
macros:
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
year,n_wealth,t_income,l_income
2+
1950,0.8257332034366338,0.44248654139458626,0.5342948198773412
3+
1953,0.8059487586599329,0.4264544060935945,0.5158978980963702
4+
1956,0.8121790488050616,0.44426942873399283,0.5349293526208142
5+
1959,0.795206874163792,0.43749348077061573,0.5213985948309416
6+
1962,0.8086945076579359,0.4435843103853645,0.5345127915054341
7+
1965,0.7904149225687935,0.43763715466663444,0.7487860020887753
8+
1968,0.7982885066993497,0.4208620794438902,0.5242396427381545
9+
1971,0.7911574835420259,0.4233344246090255,0.5576454812313466
10+
1977,0.7571418922185215,0.46187678800902543,0.5704448110072049
11+
1983,0.7494335400643013,0.439345618464469,0.5662220844385915
12+
1989,0.7715705301674302,0.5115249581654197,0.601399568747142
13+
1992,0.7508126614055308,0.4740650672076798,0.5983592657979563
14+
1995,0.7569492388110265,0.48965523558400603,0.5969779516716903
15+
1998,0.7603291991801185,0.49117441585168614,0.5774462841723305
16+
2001,0.7816118750507056,0.5239092994681135,0.6042739644967272
17+
2004,0.7700355469522361,0.4884350383903255,0.5981432201792727
18+
2007,0.7821413776486978,0.5197156312086187,0.626345219575322
19+
2010,0.8250825295193438,0.5195972120145615,0.6453653328291903
20+
2013,0.8227698931835303,0.531400174984336,0.6498682917772644
21+
2016,0.8342975903562234,0.5541400068900825,0.6706846793375284
Loading

lectures/_static/quant-econ.bib

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,31 @@
33
Note: Extended Information (like abstracts, doi, url's etc.) can be found in quant-econ-extendedinfo.bib file in _static/
44
###
55
6+
@book{Burns_2023,
7+
title={Milton Friedman: The Last Conservative by Jennifer Burns},
8+
author={Burns, Jennifer},
9+
year={2023},
10+
publisher={Farrar, Straus, and Giroux},
11+
address = {New York}
12+
}
13+
14+
@article{kuznets1939incomes,
15+
title={Incomes from independent professional practice, 1929-1936},
16+
author={Kuznets, Simon and Friedman, Milton},
17+
journal={National Bureau of Economic Research Bulletin},
18+
number = {72-23},
19+
year={1939},
20+
publisher={National Bureau of Economic Research}
21+
}
22+
23+
@book{friedman1954incomes,
24+
title={Income from Independent Professional Practice},
25+
author={Friedman, Milton and Kuznets, Simon},
26+
year={1945},
27+
publisher={National Bureau of Economic Research},
28+
address = {New York}
29+
}
30+
631
@book{smith2010wealth,
732
title = {The Wealth of Nations: An inquiry into the nature and causes of the Wealth of Nations},
833
author = {Smith, Adam},
@@ -2757,3 +2782,88 @@ @article{imampolitical
27572782
year = {2023},
27582783
journal = {IMF Working Paper}
27592784
}
2785+
2786+
@article{diamond1965national,
2787+
title = {National debt in a neoclassical growth model},
2788+
author = {Diamond, Peter A},
2789+
journal = {The American Economic Review},
2790+
volume = {55},
2791+
number = {5},
2792+
pages = {1126--1150},
2793+
year = {1965},
2794+
publisher = {JSTOR}
2795+
}
2796+
2797+
@book{auerbach1987dynamic,
2798+
title = {Dynamic fiscal policy},
2799+
author = {Auerbach, Alan J and Kotlikoff, Laurence J},
2800+
publisher = {Cambridge University Press},
2801+
address = {Cambridge},
2802+
year = {1987}
2803+
}
2804+
2805+
@article{sargent_velde1995,
2806+
title={Macroeconomic Features of the French Revolution},
2807+
author={Sargent, Thomas J and Velde, Francois R},
2808+
journal={Journal of Political Economy},
2809+
volume={103},
2810+
number={3},
2811+
pages={474--518},
2812+
year={1995}
2813+
}
2814+
2815+
@article{sargent1981,
2816+
title={Some unpleasant monetarist arithmetic},
2817+
author={Sargent, Thomas J and Wallace, Neil},
2818+
journal={Federal reserve bank of minneapolis quarterly review},
2819+
volume={5},
2820+
number={3},
2821+
pages={1--17},
2822+
year={1981}
2823+
}
2824+
2825+
2826+
2827+
2828+
@article{sargent2009conquest,
2829+
title={The conquest of South American inflation},
2830+
author={Sargent, Thomas and Williams, Noah and Zha, Tao},
2831+
journal={Journal of Political Economy},
2832+
volume={117},
2833+
number={2},
2834+
pages={211--256},
2835+
year={2009},
2836+
publisher={The University of Chicago Press}
2837+
}
2838+
2839+
@article{marcet2003recurrent,
2840+
title={Recurrent hyperinflations and learning},
2841+
author={Marcet, Albert and Nicolini, Juan P},
2842+
journal={American Economic Review},
2843+
volume={93},
2844+
number={5},
2845+
pages={1476--1498},
2846+
year={2003},
2847+
publisher={American Economic Association}
2848+
}
2849+
2850+
2851+
@article{bruno1990seigniorage,
2852+
title={Seigniorage, operating rules, and the high inflation trap},
2853+
author={Bruno, Michael and Fischer, Stanley},
2854+
journal={The Quarterly Journal of Economics},
2855+
volume={105},
2856+
number={2},
2857+
pages={353--374},
2858+
year={1990},
2859+
publisher={MIT Press}
2860+
}
2861+
2862+
@incollection{sargent1989least,
2863+
title={Least squares learning and the dynamics of hyperinflation},
2864+
author={Marcet, Albert and Sargent, Thomas J},
2865+
editor = {William Barnett, John Geweke, and Karl Shell},
2866+
booktitle={Sunspots, Complexity, and Chaos},
2867+
year={1989},
2868+
publisher={Cambridge University Press}
2869+
}

lectures/_toc.yml

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,27 @@ parts:
1010
chapters:
1111
- file: long_run_growth
1212
- file: business_cycle
13+
- file: inflation_history
1314
- file: inequality
14-
- caption: Essential Tools
15+
- caption: Foundations
1516
numbered: true
1617
chapters:
17-
- file: linear_equations
18-
- file: eigen_I
1918
- file: intro_supply_demand
20-
- caption: Linear Dynamics
19+
- file: linear_equations
20+
- file: complex_and_trig
21+
- file: geom_series
22+
- caption: "Linear Dynamics: Finite Horizons"
2123
numbered: true
2224
chapters:
2325
- file: pv
2426
- file: cons_smooth
2527
- file: equalizing_difference
26-
- file: inflation_history
2728
- file: cagan_ree
2829
- file: cagan_adaptive
29-
- file: geom_series
30+
- caption: "Linear Dynamics: Infinite Horizons"
31+
numbered: true
32+
chapters:
33+
- file: eigen_I
3034
- caption: Probability and Distributions
3135
numbered: true
3236
chapters:
@@ -43,9 +47,19 @@ parts:
4347
- file: cobweb
4448
- file: olg
4549
- file: commod_price
50+
- caption: Monetary-Fiscal Policy Interactions
51+
numbered: true
52+
chapters:
53+
- file: money_inflation
54+
- file: unpleasant
55+
- file: money_inflation_nonlinear
56+
- file: laffer_adaptive
57+
#- file: french_rev
58+
#- file: ak2
4659
- caption: Stochastic Dynamics
4760
numbered: true
4861
chapters:
62+
- file: ar1_processes
4963
- file: markov_chains_I
5064
- file: markov_chains_II
5165
- file: time_series_with_matrices

0 commit comments

Comments
 (0)