Merge branch 'main' into patch-5

Author: kuramogura

environment.yml

@@ -6,8 +6,7 @@ dependencies:
   - anaconda=2020.11
   - pip
   - pip:
-    - jupyter-book==0.11.1
-    - sphinx-multitoc-numbering==0.1.3
+    - jupyter-book==0.11.2
     - quantecon-book-theme==0.2.3
     - sphinx-tojupyter==0.1.2
     - sphinxext-rediraffe==0.2.7

lectures/career.md

@@ -300,11 +300,12 @@ def solve_model(cw,
             print(f"Error at iteration {i} is {error}.")
         v = v_new
 
-    if i == max_iter:
+    if i == max_iter and error > tol:
         print("Failed to converge!")
 
-    if verbose and i < max_iter:
-        print(f"\nConverged in {i} iterations.")
+    else:
+        if verbose:
+            print(f"\nConverged in {i} iterations.")
 
     return v_new
 ```
@@ -430,10 +431,12 @@ def gen_path(optimal_policy, F, G, t=20):
     θ_index = []
     ϵ_index = []
     for t in range(t):
-        if greedy_star[i, j] == 1:       # Stay put
+        if optimal_policy[i, j] == 1:       # Stay put
             pass
+
         elif greedy_star[i, j] == 2:     # New job
             j = qe.random.draw(G)
+
         else:                            # New life
             i, j = qe.random.draw(F), qe.random.draw(G)
         θ_index.append(i)