Skip to content

Commit 925363d

Browse files
authored
Merge branch 'main' into equalizing_diff
2 parents 5c35b28 + 87ea6f0 commit 925363d

File tree

12 files changed

+1058
-291
lines changed

12 files changed

+1058
-291
lines changed

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
with:
8888
github_token: ${{ secrets.GITHUB_TOKEN }}
8989
publish_dir: _build/html/
90-
# cname: intro.quantecon.org
90+
cname: intro.quantecon.org
9191
- name: Upload "_build" folder (cache)
9292
uses: actions/upload-artifact@v2
9393
with:

lectures/_static/quant-econ.bib

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
Note: Extended Information (like abstracts, doi, url's etc.) can be found in quant-econ-extendedinfo.bib file in _static/
44
###
55
6+
7+
@misc{Tooze_2014,
8+
title={The Deluge: The Great War, America and the Remaking of the Global Order, 1916--1931},
9+
author = {Adam Tooze},
10+
address = {New York},
11+
publisher = {Viking},
12+
year = {2014}
13+
}
14+
15+
16+
617
@article{chambers1996theory,
718
title={A theory of commodity price fluctuations},
819
author={Chambers, Marcus J and Bailey, Roy E},

lectures/asset_pricing.md

Lines changed: 0 additions & 14 deletions
This file was deleted.

lectures/cagan_ree.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import matplotlib.pyplot as plt
3131
We'll use linear algebra first to explain and then do some experiments with a "fiscal theory of the price level".
3232

3333

34-
According to this model, when the government persistently spends more than it collects in taxes and prints money to finance the shortfall (the "shortfall is called the "government deficit"), it puts upward pressure on the price level and generates
34+
According to this model, when the government persistently spends more than it collects in taxes and prints money to finance the shortfall (the "shortfall" is called the "government deficit"), it puts upward pressure on the price level and generates
3535
persistent inflation.
3636

3737
The "fiscal theory of the price level" asserts that
@@ -50,7 +50,7 @@ In those experiments, we'll encounter an instance of a ''velocity dividend'' tha
5050

5151
To facilitate using linear matrix algebra as our main mathematical tool, we'll use a finite horizon version of the model.
5252

53-
As in several other lectures, the only linear algebra that we'll be using
53+
As in the {doc}`present values <pv>` and {doc}`consumption smoothing<cons_smooth>` lectures, the only linear algebra that we'll be using
5454
are matrix multplication and matrix inversion.
5555

5656

@@ -626,7 +626,11 @@ Simply glue the sequences $t\leq T_1$ and $t > T_1$.
626626
We reset $m_{T_{1}}$ so that $p_{T_{1}}=\left(m_{T_{1}-1}+\mu_{0}\right)+\alpha\mu_{0}$, with $\pi_{T_{1}}=\mu^{*}$.
627627
628628
Then,
629-
$$ m_{T_{1}}=p_{T_{1}}-\alpha\pi_{T_{1}}=\left(m_{T_{1}-1}+\mu_{0}\right)+\alpha\left(\mu_{0}-\mu^{*}\right) $$
629+
630+
$$
631+
m_{T_{1}}=p_{T_{1}}-\alpha\pi_{T_{1}}=\left(m_{T_{1}-1}+\mu_{0}\right)+\alpha\left(\mu_{0}-\mu^{*}\right)
632+
$$
633+
630634
We then compute for the remaining $T-T_{1}$ periods with $\mu_{s}=\mu^{*},\forall s\geq T_{1}$ and the initial condition $m_{T_{1}}$ from above.
631635
632636

lectures/comparative_adv.md

Lines changed: 0 additions & 14 deletions
This file was deleted.

lectures/cons_smooth.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ kernelspec:
1919

2020
In this notebook, we'll present some useful models of economic dynamics using only linear algebra -- matrix multiplication and matrix inversion.
2121

22-
**Present value formulas** are at the core of the models.
22+
{doc}`Present value formulas<pv>` are at the core of the models.
2323

2424
```{code-cell} ipython3
2525
import numpy as np

lectures/intro.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ kernelspec:
1414
This lecture series provides an introduction to quantitative economics using Python.
1515

1616
It was designed and written by [Thomas J. Sargent](http://www.tomsargent.com/), [John Stachurski](http://johnstachurski.net/), and the rest of the QuantEcon team.
17-
18-
See [About these Lectures](about.md) for background and reading suggestions.
1917
```{tableofcontents}
2018
```
2119

0 commit comments

Comments
 (0)