Merge pull request #604 from sbenthall/i602-ex-cleanup

Examples cleanup
econ-ark · Mar 30, 2020 · 9cef11f · 9cef11f
2 parents 32119d8 + 300b3f0
commit 9cef11f
Show file tree

Hide file tree

Showing 7 changed files with 322 additions and 118 deletions.
diff --git a/examples/ConsumptionSaving/example_ConsGenIncProcessModel.ipynb b/examples/ConsumptionSaving/example_ConsGenIncProcessModel.ipynb
diff --git a/examples/ConsumptionSaving/example_ConsIndShock.ipynb b/examples/ConsumptionSaving/example_ConsIndShock.ipynb
diff --git a/examples/ConsumptionSaving/example_ConsRepAgentModel.ipynb b/examples/ConsumptionSaving/example_ConsRepAgentModel.ipynb
@@ -10,7 +10,10 @@
  "from time import time\n",
  "import numpy as np\n",
  "from HARK.utilities import plotFuncs\n",
- "import HARK.ConsumptionSaving.ConsumerParameters as Params\n",
+ "from HARK.ConsumptionSaving.ConsIndShockModel import (\n",
+ " init_idiosyncratic_shocks\n",
+ ")\n",
+ "\n",
  "from HARK.ConsumptionSaving.ConsRepAgentModel import (\n",
  " RepAgentConsumerType,\n",
  " RepAgentMarkovConsumerType,\n",
@@ -24,7 +27,7 @@
  "outputs": [],
  "source": [
  "# Make a quick example dictionary\n",
- "RA_params = deepcopy(Params.init_idiosyncratic_shocks)\n",
+ "RA_params = deepcopy(init_idiosyncratic_shocks)\n",
  "RA_params[\"DeprFac\"] = 0.05\n",
  "RA_params[\"CapShare\"] = 0.36\n",
  "RA_params[\"UnempPrb\"] = 0.0\n",
@@ -40,7 +43,7 @@
  "name": "stdout",
  "output_type": "stream",
  "text": [
- "Solving a representative agent problem took 0.2792696952819824 seconds.\n"
+ "Solving a representative agent problem took 0.13683128356933594 seconds.\n"
  ]
  },
  {
@@ -77,7 +80,7 @@
  "name": "stdout",
  "output_type": "stream",
  "text": [
- "Simulating a representative agent for 2000 periods took 9.091149091720581 seconds.\n"
+ "Simulating a representative agent for 2000 periods took 2.0891530513763428 seconds.\n"
  ]
  }
  ],
@@ -107,7 +110,7 @@
  "name": "stdout",
  "output_type": "stream",
  "text": [
- "Solving a two state representative agent problem took 0.7686238288879395 seconds.\n"
+ "Solving a two state representative agent problem took 0.4116179943084717 seconds.\n"
  ]
  },
  {
@@ -151,7 +154,7 @@
  "name": "stdout",
  "output_type": "stream",
  "text": [
- "Simulating a two state representative agent for 2000 periods took 9.762195110321045 seconds.\n"
+ "Simulating a two state representative agent for 2000 periods took 2.3863446712493896 seconds.\n"
  ]
  }
  ],
@@ -194,7 +197,7 @@
  "name": "python",
  "nbconvert_exporter": "python",
  "pygments_lexer": "ipython3",
- "version": "3.7.5"
+ "version": "3.6.9"
  }
  },
  "nbformat": 4,

diff --git a/examples/Gentle-Intro/Gentle-Intro-To-HARK.ipynb b/examples/Gentle-Intro/Gentle-Intro-To-HARK.ipynb
diff --git a/examples/Gentle-Intro/Gentle-Intro-To-HARK.py b/examples/Gentle-Intro/Gentle-Intro-To-HARK.py
@@ -7,7 +7,7 @@
 # extension: .py
 # format_name: percent
 # format_version: '1.2'
-# jupytext_version: 1.2.3
+# jupytext_version: 1.2.4
 # kernelspec:
 # display_name: Python 3
 # language: python
@@ -149,12 +149,12 @@
 print("This agent's consumption function is defined (consumption is positive) down to m_t = " + str(mMinimum))
 
 # %% [markdown]
-# Yikes! Let's take a look at the bottom of the consumption function. In the cell below, set the bounds of the $\texttt{plotFuncs}$ function to display down to the lowest defined value of the consumption function.
+# Yikes! Let's take a look at the bottom of the consumption function. In the cell below, the bounds of the $\texttt{plotFuncs}$ function are set to display down to the lowest defined value of the consumption function.
 
 # %%
-# YOUR FIRST HANDS-ON EXERCISE!
-# Fill in the value for "mPlotBottom" to plot the consumption function from the point where it is zero.
-plotFuncs(PFexample.solution[0].cFunc,mPlotBottom,mPlotTop)
+plotFuncs(PFexample.solution[0].cFunc,
+ mMinimum,
+ mPlotTop)
 
 # %% [markdown]
 # ## Changing Agent Parameters
@@ -171,7 +171,10 @@
 NewExample.DiscFac = 0.90
 NewExample.solve()
 mPlotBottom = mMinimum
-plotFuncs([PFexample.solution[0].cFunc,NewExample.solution[0].cFunc],mPlotBottom,mPlotTop)
+plotFuncs([PFexample.solution[0].cFunc,
+ NewExample.solution[0].cFunc],
+ mPlotBottom,
+ mPlotTop)
 
 # %% [markdown]
 # (Note that you can pass a **list** of functions to $\texttt{plotFuncs}$ as the first argument rather than just a single function. Lists are written inside of [square brackets].)