clean up

econ-ark · Nov 7, 2023 · 4c50449 · 4c50449
1 parent 34e0dac
commit 4c50449
Show file tree

Hide file tree

Showing 24 changed files with 96 additions and 261 deletions.
diff --git a/examples/Calibration/Income_calibrations.ipynb b/examples/Calibration/Income_calibrations.ipynb
@@ -96,7 +96,6 @@
     }
    ],
    "source": [
-    "\n",
     "age_min = 25\n",
     "age_max = 91\n",
     "# Cagetti has a year trend in his specification, so we have to say on what\n",
@@ -114,7 +113,7 @@
     "        age_max=age_max,\n",
     "        adjust_infl_to=adjust_infl_to,\n",
     "        start_year=start_year,\n",
-    "        **spec[1]\n",
+    "        **spec[1],\n",
     "    )\n",
     "    MeanY = find_profile(params[\"PermGroFac\"], params[\"P0\"])\n",
     "\n",

diff --git a/examples/Calibration/Life_Cycle_example.ipynb b/examples/Calibration/Life_Cycle_example.ipynb
@@ -47,7 +47,7 @@
     "    age_max=death_age,\n",
     "    adjust_infl_to=adjust_infl_to,\n",
     "    **income_calib[education],\n",
-    "    SabelhausSong=True\n",
+    "    SabelhausSong=True,\n",
     ")\n",
     "\n",
     "# Initial distribution of wealth and permanent income\n",

diff --git a/examples/Calibration/SCF_distributions.ipynb b/examples/Calibration/SCF_distributions.ipynb
@@ -84,7 +84,6 @@
     }
    ],
    "source": [
-    "\n",
     "# Formatting\n",
     "frame = frame.melt(id_vars=[\"base_year\", \"age\", \"education\", \"wave\"])\n",
     "aux = frame[\"variable\"].str.split(\"(Mean|Std)\", n=1, expand=True)\n",

diff --git a/examples/Calibration/Sabelhaus_Song_var_profiles.ipynb b/examples/Calibration/Sabelhaus_Song_var_profiles.ipynb
@@ -77,7 +77,6 @@
     }
    ],
    "source": [
-    "\n",
     "# Plot transitory shock variances\n",
     "plt.figure()\n",
     "for i in range(len(cohorts)):\n",

diff --git a/examples/Calibration/US_SSA_life_tables.ipynb b/examples/Calibration/US_SSA_life_tables.ipynb
@@ -59,7 +59,6 @@
     }
    ],
    "source": [
-    "\n",
     "tables = get_ssa_life_tables()\n",
     "print(tables.head)"
    ]
@@ -73,7 +72,6 @@
    },
    "outputs": [],
    "source": [
-    "\n",
     "# We will find 1-year survival probabilities from ages 21 to 100\n",
     "min_age = 21\n",
     "max_age = 100\n",
@@ -111,7 +109,6 @@
     }
    ],
    "source": [
-    "\n",
     "# First, the \"longitudinal method\", which gives us the probabilities\n",
     "# experienced by agents born in \"year\" throughout their lived\n",
     "plt.figure()\n",
@@ -156,7 +153,6 @@
     }
    ],
    "source": [
-    "\n",
     "# Second, the \"cross-sectional method\", which gives us the probabilities of\n",
     "# survivals of individuals of differnet ages that are alive in the given year.\n",
     "plt.figure()\n",

diff --git a/examples/ConsIndShockModel/Finite Cyclical Test.ipynb b/examples/ConsIndShockModel/Finite Cyclical Test.ipynb
@@ -8,9 +8,7 @@
    "source": [
     "# Initial imports and notebook setup, click arrow to show\n",
     "from HARK.ConsumptionSaving.ConsIndShockModel import IndShockConsumerType\n",
-    "from HARK.utilities import plot_funcs_der, plot_funcs\n",
-    "import matplotlib.pyplot as plt\n",
-    "import numpy as np\n",
+    "from HARK.utilities import plot_funcs\n",
     "\n",
     "mystr = lambda number: \"{:.4f}\".format(number)"
    ]

diff --git a/examples/ConsIndShockModel/IndShockConsumerType_Jacobian_Example.ipynb b/examples/ConsIndShockModel/IndShockConsumerType_Jacobian_Example.ipynb
@@ -30,9 +30,7 @@
     "\n",
     "\n",
     "import time\n",
-    "import numpy as np\n",
-    "import matplotlib.pyplot as plt\n",
-    "from copy import copy, deepcopy"
+    "import matplotlib.pyplot as plt"
    ]
   },
   {
@@ -73,7 +71,6 @@
    },
    "outputs": [],
    "source": [
-    "\n",
     "Agent = IndShockConsumerType(**Dict)"
    ]
   },
@@ -118,7 +115,6 @@
     }
    ],
    "source": [
-    "\n",
     "start = time.time()\n",
     "Agent.compute_steady_state()\n",
     "print(\"Seconds to compute steady state\", time.time() - start)"
@@ -159,7 +155,6 @@
     }
    ],
    "source": [
-    "\n",
     "start = time.time()\n",
     "\n",
     "CJAC_Perm, AJAC_Perm = Agent.calc_jacobian(\"PermShkStd\", 300)\n",
@@ -195,7 +190,6 @@
     }
    ],
    "source": [
-    "\n",
     "plt.plot(CJAC_Perm.T[0])\n",
     "plt.plot(CJAC_Perm.T[10])\n",
     "plt.plot(CJAC_Perm.T[30])\n",
@@ -230,7 +224,6 @@
     }
    ],
    "source": [
-    "\n",
     "plt.plot(AJAC_Perm.T[0])\n",
     "plt.plot(AJAC_Perm.T[10])\n",
     "plt.plot(AJAC_Perm.T[30])\n",
@@ -286,7 +279,6 @@
     }
    ],
    "source": [
-    "\n",
     "plt.plot(CJAC_Rfree.T[0])\n",
     "plt.plot(CJAC_Rfree.T[10])\n",
     "plt.plot(CJAC_Rfree.T[30])\n",
@@ -320,7 +312,6 @@
     }
    ],
    "source": [
-    "\n",
     "plt.plot(AJAC_Rfree.T[0])\n",
     "plt.plot(AJAC_Rfree.T[10])\n",
     "plt.plot(AJAC_Rfree.T[30])\n",