Skip to content

Commit 198c8cc

Browse files
authored
Merge branch 'main' into ad
2 parents 065f041 + f5f7161 commit 198c8cc

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

lectures/lp_intro.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ $$
9696

9797
The following graph illustrates the firm's constraints and iso-revenue lines.
9898

99+
Iso-revenue lines show all the combinations of materials and labor that produce the same revenue.
100+
99101
```{code-cell} ipython3
100102
---
101103
tags: [hide-input]
@@ -340,7 +342,7 @@ OR-Tools tells us that the best investment strategy is:
340342

341343
3. At the beginning of the third year, the bank balance should be $ \$75,072.245 $.
342344

343-
4. At the end of the third year, the mutual fund will get payouts from the annuity and corporate bond and repay its loan from the bank. At the end it will own $ \$141018.24 $, so that it's total net rate of return over the three periods is $ 41.02\%$.
345+
4. At the end of the third year, the mutual fund will get payouts from the annuity and corporate bond and repay its loan from the bank. At the end it will own $ \$141,018.24 $, so that it's total net rate of return over the three periods is $ 41.02\%$.
344346

345347

346348

@@ -547,14 +549,14 @@ c_ex2 = np.array([1.30*3, 0, 0, 1.06, 1.30])
547549
A_ex2 = np.array([[1, 1, 0, 0, 0],
548550
[1, -rate, 1, 0, 1],
549551
[1, 0, -rate, 1, 0]])
550-
b_ex2 = np.array([100000, 0, 0])
552+
b_ex2 = np.array([100_000, 0, 0])
551553
552554
# Bounds on decision variables
553555
bounds_ex2 = [( 0, None),
554-
(-20000, None),
555-
(-20000, None),
556-
(-20000, None),
557-
( 0, 50000)]
556+
(-20_000, None),
557+
(-20_000, None),
558+
(-20_000, None),
559+
( 0, 50_000)]
558560
```
559561
560562
Let's solve the problem and check the status using `success` attribute.
@@ -586,7 +588,7 @@ SciPy tells us that the best investment strategy is:
586588
587589
3. At the beginning of the third year, the mutual fund should borrow $ \$20,000$ from the bank and invest in the annuity.
588590
589-
4. At the end of the third year, the mutual fund will get payouts from the annuity and corporate bond and repay its loan from the bank. At the end it will own $ \$141018.24 $, so that it's total net rate of return over the three periods is $ 41.02\% $.
591+
4. At the end of the third year, the mutual fund will get payouts from the annuity and corporate bond and repay its loan from the bank. At the end it will own $ \$141,018.24 $, so that it's total net rate of return over the three periods is $ 41.02\% $.
590592
591593
592594

lectures/solow.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,11 @@ $$
5555
Production functions with this property include
5656

5757
* the **Cobb-Douglas** function $F(K, L) = A K^{\alpha}
58-
L^{1-\alpha}$ with $0 \leq \alpha \leq 1$ and
58+
L^{1-\alpha}$ with $0 \leq \alpha \leq 1$.
5959
* the **CES** function $F(K, L) = \left\{ a K^\rho + b L^\rho \right\}^{1/\rho}$
60-
with $a, b, \rho > 0$.
60+
with $a, b, \rho > 0$.
61+
62+
Here, $\alpha$ is the output elasticity of capital and $\rho$ is a parameter that determines the elasticity of substitution between capital and labor.
6163

6264
We assume a closed economy, so aggregate domestic investment equals aggregate domestic
6365
saving.
@@ -81,6 +83,7 @@ Setting $k_t := K_t / L$ and using homogeneity of degree one now yields
8183

8284
$$
8385
k_{t+1}
86+
= s \frac{F(K_t, L)}{L} + (1 - \delta) \frac{K_t}{L}
8487
= s \frac{F(K_t, L)}{L} + (1 - \delta) k_t
8588
= s F(k_t, 1) + (1 - \delta) k_t
8689
$$

0 commit comments

Comments
 (0)