Skip to content

Commit 2c42f39

Browse files
committed
Merge remote-tracking branch 'origin/main' into lake-model
2 parents 5041e47 + 4d5d492 commit 2c42f39

File tree

14 files changed

+891
-207
lines changed

14 files changed

+891
-207
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ jobs:
3737
- name: Display Pip Versions
3838
shell: bash -l {0}
3939
run: pip list
40-
# - name: Download "build" folder (cache)
41-
# uses: dawidd6/action-download-artifact@v2
42-
# with:
43-
# workflow: cache.yml
44-
# branch: main
45-
# name: build-cache
46-
# path: _build
40+
- name: Download "build" folder (cache)
41+
uses: dawidd6/action-download-artifact@v2
42+
with:
43+
workflow: cache.yml
44+
branch: main
45+
name: build-cache
46+
path: _build
4747
# Build Assets (Download Notebooks and PDF via LaTeX)
4848
# - name: Build PDF from LaTeX
4949
# shell: bash -l {0}
@@ -63,7 +63,7 @@ jobs:
6363
- name: Build HTML
6464
shell: bash -l {0}
6565
run: |
66-
# rm -r _build/.doctrees
66+
rm -r _build/.doctrees
6767
jb build lectures --path-output ./ -W --keep-going
6868
- name: Upload Execution Reports (HTML)
6969
uses: actions/upload-artifact@v2

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies:
66
- anaconda=2022.10
77
- pip
88
- pip:
9-
- jupyter-book==0.14.0
9+
- jupyter-book==0.15.1
1010
# - quantecon-book-theme==0.3.2
1111
# - sphinx-tojupyter==0.2.1
1212
- sphinxext-rediraffe==0.2.7

in-work/supply_demand_foundations_v2.md

Lines changed: 216 additions & 172 deletions
Large diffs are not rendered by default.

lectures/_toc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ parts:
1717
- file: linear_equations
1818
- file: lp_intro
1919
- file: lln_clt
20+
- file: monte_carlo
2021
- file: markov_chains
2122
- caption: Estimation
2223
numbered: true

lectures/about.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ not essential.
5353
## Credits
5454

5555
In building this lecture series, we had invaluable assistance from research
56-
assistants at QuantEcon, as well as our QuantEcon colleages. Without their
56+
assistants at QuantEcon, as well as our QuantEcon colleagues. Without their
5757
help this series would not have been possible.
5858

5959
In particular, we sincerely thank and give credit to

lectures/business_cycle.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ kernelspec:
1515

1616
## Overview
1717

18-
This lecture is about illustrateing business cycles in different countries and period.
18+
This lecture is about illustrating business cycles in different countries and period.
1919

2020
The business cycle refers to the fluctuations in economic activity over time. These fluctuations can be observed in the form of expansions, contractions, recessions, and recoveries in the economy.
2121

22-
In this lecture, we will see expensions and contractions of economies from 1960s to the recent pandemic using [World Bank API](https://documents.worldbank.org/en/publication/documents-reports/api).
22+
In this lecture, we will see expansions and contractions of economies from 1960s to the recent pandemic using [World Bank API](https://documents.worldbank.org/en/publication/documents-reports/api).
2323

2424
In addition to what's in Anaconda, this lecture will need the following libraries to get World bank data
2525

@@ -49,7 +49,7 @@ So let's explore how to query data together.
4949

5050
We can use `wb.series.info` with parameter `q` to query available data from the World Bank (`imfpy. searches.database_codes()` in `imfpy`)
5151

52-
For example, GDP growth is a key indicator to show the expension and contraction of level of economic activities.
52+
For example, GDP growth is a key indicator to show the expansion and contraction of level of economic activities.
5353

5454
Let's retrive GDP growth data together
5555

@@ -97,7 +97,7 @@ wb.series.info(q='consumption')
9797
wb.series.info(q='capital account') # TODO: Check if it is to be plotted
9898
```
9999

100-
- international trade volumn
100+
- international trade volume
101101

102102
+++
103103

@@ -342,7 +342,7 @@ def plot_trade(data, title, ylabel, title_pos, ax, g_params, b_params, t_params)
342342
343343
344344
fig, ax = plt.subplots()
345-
title = 'United States (International Trade Volumn)'
345+
title = 'United States (International Trade Volume)'
346346
ylabel = 'US Dollars, Millions'
347347
plot_UStrade = plot_trade(trade_us[['Period', 'Twoway Trade']], title, ylabel, 0.05, ax, g_params, b_params, t_params)
348348
```
@@ -352,7 +352,7 @@ fig, ax = plt.subplots()
352352
trade_cn = dots('CN','W00', 1960, 2020, freq='A')
353353
354354
trade_cn['Period'] = trade_cn['Period'].astype('int')
355-
title = 'China (International Trade Volumn)'
355+
title = 'China (International Trade Volume)'
356356
ylabel = 'US Dollars, Millions'
357357
plot_trade_cn = plot_trade(trade_cn[['Period', 'Twoway Trade']], title, ylabel, 0.05, ax, g_params, b_params, t_params)
358358
```
@@ -362,7 +362,7 @@ fig, ax = plt.subplots()
362362
trade_mx = dots('MX','W00', 1960, 2020, freq='A')
363363
364364
trade_mx['Period'] = trade_mx['Period'].astype('int')
365-
title = 'Mexico (International Trade Volumn)'
365+
title = 'Mexico (International Trade Volume)'
366366
ylabel = 'US Dollars, Millions'
367367
plot_trade_mx = plot_trade(trade_mx[['Period', 'Twoway Trade']], title, ylabel, 0.05, ax, g_params, b_params, t_params)
368368
```
@@ -372,7 +372,7 @@ fig, ax = plt.subplots()
372372
trade_ar = dots('AR','W00', 1960, 2020, freq='A')
373373
374374
trade_ar['Period'] = trade_ar['Period'].astype('int')
375-
title = 'Argentina (International Trade Volumn)'
375+
title = 'Argentina (International Trade Volume)'
376376
ylabel = 'US Dollars, Millions'
377377
plot_trade_ar = plot_trade(trade_ar[['Period', 'Twoway Trade']], title, ylabel, 0.05, ax, g_params, b_params, t_params)
378378
```

lectures/cobweb.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ You can imagine how these dynamics could cause cycles in prices and quantities
4949
that persist over time.
5050

5151
The cobweb model puts these ideas into equations so we can try to quantify
52-
them, and to study conditions underw which cycles persist (or disappear).
52+
them, and to study conditions under which cycles persist (or disappear).
5353

5454
In this lecture, we investigate and simulate the basic model under different
5555
assumptions regarding the way that produces form expectations.

lectures/lln_clt.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ This means that the distribution of $\bar X_n$ does not eventually concentrate o
358358

359359
Hence the LLN does not hold.
360360

361-
The LLN fails to hold here because the assumpton $\mathbb E|X| = \infty$ is violated by the Cauchy distribution.
361+
The LLN fails to hold here because the assumption $\mathbb E|X| = \infty$ is violated by the Cauchy distribution.
362362

363363
+++
364364

@@ -650,7 +650,7 @@ $$
650650
$$
651651

652652
Finally, since both $X_t$ and $\epsilon_0$ are normally distributed and
653-
independent from each other, any linear combinary of these two variables is
653+
independent from each other, any linear combination of these two variables is
654654
also normally distributed.
655655

656656
We have now shown that

lectures/long_run_growth.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ ax.set_ylabel("GDP per capita (current US$) ")
148148

149149
### Plot for lower middle income and low income
150150

151-
Finally, we compare time-series graphs of GDP per capita between a lower middle income country and a low income country. Again, keeping Pakistan fixed in our set as a lower middle income country, we choose Democratic Republic of Congo as our second country from a low income group. Congo is chosen for no particular reason apart from its unstable political atmoshpere and a dwindling economy.
152-
On comapring we see quite a bit of difference between these countries. With Pakistan's GDP per capita being almost four times as much. Further strengthning our assumption that countries from different income groups can be quite different.
151+
Finally, we compare time-series graphs of GDP per capita between a lower middle income country and a low income country. Again, keeping Pakistan fixed in our set as a lower middle income country, we choose Democratic Republic of Congo as our second country from a low income group. Congo is chosen for no particular reason apart from its unstable political atmosphere and a dwindling economy.
152+
On comparing we see quite a bit of difference between these countries. With Pakistan's GDP per capita being almost four times as much. Further strengthening our assumption that countries from different income groups can be quite different.
153153

154154
```{code-cell} ipython3
155155
# Pakistan, Congo (Lower middle income, low income)

lectures/lp_intro.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ By deploying the following steps, any linear programming problem can be transfor
412412
413413
1. **Objective Function:** If a problem is originally a constrained **maximization** problem, we can construct a new objective function that is the additive inverse of the original objective function. The transformed problem is then a **minimization** problem.
414414
415-
2. **Decision Variables:** Given a variable $x_j$ satisfying $x_j \le 0$, we can introduce a new variable $x_j' = - x_j$ and subsitute it into original problem. Given a free variable $x_i$ with no restriction on its sign, we can introduce two new variables $x_j^+$ and $x_j^-$ satisfying $x_j^+, x_j^- \ge 0$ and replace $x_j$ by $x_j^+ - x_j^-$.
415+
2. **Decision Variables:** Given a variable $x_j$ satisfying $x_j \le 0$, we can introduce a new variable $x_j' = - x_j$ and substitute it into original problem. Given a free variable $x_i$ with no restriction on its sign, we can introduce two new variables $x_j^+$ and $x_j^-$ satisfying $x_j^+, x_j^- \ge 0$ and replace $x_j$ by $x_j^+ - x_j^-$.
416416
417417
3. **Inequality constraints:** Given an inequality constraint $\sum_{j=1}^n a_{ij}x_j \le 0$, we can introduce a new variable $s_i$, called a **slack variable** that satisfies $s_i \ge 0$ and replace the original constraint by $\sum_{j=1}^n a_{ij}x_j + s_i = 0$.
418418

0 commit comments

Comments
 (0)