Merge branch 'i87' of github.com:sbenthall/DemARK into i87

econ-ark · Feb 17, 2020 · ffbe9a0 · ffbe9a0
2 parents 71205f9 + c401b6c
commit ffbe9a0
Show file tree

Hide file tree

Showing 22 changed files with 277 additions and 963 deletions.
diff --git a/notebooks/ChangeLiqConstr.ipynb b/notebooks/ChangeLiqConstr.ipynb
@@ -18,7 +18,6 @@
     "from HARK.ConsumptionSaving.ConsIndShockModel import *\n",
     "import HARK.ConsumptionSaving.ConsumerParameters as Params\n",
     "from HARK.utilities import plotFuncsDer, plotFuncs\n",
-    "from time import clock\n",
     "mystr = lambda number : \"{:.4f}\".format(number)\n",
     "\n",
     "import matplotlib.pyplot as plt"
@@ -120,7 +119,7 @@
  ],
  "metadata": {
   "jupytext": {
-   "cell_metadata_filter": "collapsed",
+   "cell_metadata_filter": "collapsed,code_folding",
    "formats": "ipynb,py"
   },
   "kernelspec": {
@@ -142,5 +141,5 @@
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }
diff --git a/notebooks/ChangeLiqConstr.py b/notebooks/ChangeLiqConstr.py
@@ -1,13 +1,13 @@
 # ---
 # jupyter:
 #   jupytext:
-#     cell_metadata_filter: collapsed
+#     cell_metadata_filter: collapsed,code_folding
 #     formats: ipynb,py
 #     text_representation:
 #       extension: .py
 #       format_name: light
 #       format_version: '1.4'
-#       jupytext_version: 1.2.1
+#       jupytext_version: 1.2.3
 #   kernelspec:
 #     display_name: Python 3
 #     language: python
@@ -22,7 +22,6 @@
 from HARK.ConsumptionSaving.ConsIndShockModel import *
 import HARK.ConsumptionSaving.ConsumerParameters as Params
 from HARK.utilities import plotFuncsDer, plotFuncs
-from time import clock
 mystr = lambda number : "{:.4f}".format(number)
 
 import matplotlib.pyplot as plt

diff --git a/notebooks/Gentle-Intro-To-HARK-PerfForesightCRRA.ipynb b/notebooks/Gentle-Intro-To-HARK-PerfForesightCRRA.ipynb
@@ -35,7 +35,6 @@
     "\n",
     "import numpy as np\n",
     "import HARK \n",
-    "from time import clock\n",
     "from copy import deepcopy\n",
     "mystr = lambda number : \"{:.4f}\".format(number)\n",
     "from HARK.utilities import plotFuncs"
@@ -369,5 +368,5 @@
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }
diff --git a/notebooks/Gentle-Intro-To-HARK-PerfForesightCRRA.py b/notebooks/Gentle-Intro-To-HARK-PerfForesightCRRA.py
@@ -6,7 +6,7 @@
 #       extension: .py
 #       format_name: percent
 #       format_version: '1.2'
-#       jupytext_version: 1.2.1
+#       jupytext_version: 1.2.3
 #   kernelspec:
 #     display_name: Python 3
 #     language: python
@@ -35,7 +35,6 @@
 
 import numpy as np
 import HARK 
-from time import clock
 from copy import deepcopy
 mystr = lambda number : "{:.4f}".format(number)
 from HARK.utilities import plotFuncs

diff --git a/notebooks/Gentle-Intro-To-HARK.ipynb b/notebooks/Gentle-Intro-To-HARK.ipynb
diff --git a/notebooks/Gentle-Intro-To-HARK.py b/notebooks/Gentle-Intro-To-HARK.py
diff --git a/notebooks/IncExpectationExample.ipynb b/notebooks/IncExpectationExample.ipynb
@@ -31,11 +31,10 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "metadata": {
-    "code_folding": [
-     0
-    ]
+    "code_folding": [],
+    "lines_to_next_cell": 1
    },
    "outputs": [],
    "source": [
@@ -52,7 +51,6 @@
     "import HARK.ConsumptionSaving.ConsumerParameters as Params\n",
     "\n",
     "from HARK.utilities import approxUniform, getLorenzShares, calcSubpopAvg\n",
-    "from time import clock\n",
     "mystr = lambda number : \"{:.4f}\".format(number)"
    ]
   },
@@ -61,9 +59,9 @@
    "execution_count": 2,
    "metadata": {
     "code_folding": [
-     1,
-     2
-    ]
+     1
+    ],
+    "lines_to_next_cell": 1
    },
    "outputs": [],
    "source": [
@@ -85,8 +83,9 @@
    "execution_count": 3,
    "metadata": {
     "code_folding": [
-     0
-    ]
+     1
+    ],
+    "lines_to_next_cell": 1
    },
    "outputs": [],
    "source": [
@@ -137,8 +136,7 @@
    "metadata": {
     "code_folding": [
      1
-    ],
-    "lines_to_next_cell": 2
+    ]
    },
    "outputs": [],
    "source": [
@@ -249,9 +247,7 @@
    "cell_type": "code",
    "execution_count": 5,
    "metadata": {
-    "code_folding": [
-     0
-    ],
+    "code_folding": [],
     "lines_to_next_cell": 2
    },
    "outputs": [
@@ -359,16 +355,8 @@
    }
   },
   "jupytext": {
-   "formats": "ipynb,py:percent",
-   "metadata_filter": {
-    "cells": "collapsed"
-   },
-   "text_representation": {
-    "extension": ".py",
-    "format_name": "percent",
-    "format_version": "1.1",
-    "jupytext_version": "0.8.3"
-   }
+   "cell_metadata_filter": "collapsed,code_folding",
+   "formats": "ipynb,py:percent"
   },
   "kernelspec": {
    "display_name": "Python 3",
@@ -418,5 +406,5 @@
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }
diff --git a/notebooks/IncExpectationExample.py b/notebooks/IncExpectationExample.py
@@ -1,13 +1,13 @@
 # ---
 # jupyter:
 #   jupytext:
-#     cell_metadata_filter: collapsed
+#     cell_metadata_filter: collapsed,code_folding
 #     formats: ipynb,py:percent
 #     text_representation:
 #       extension: .py
 #       format_name: percent
 #       format_version: '1.2'
-#       jupytext_version: 1.1.3
+#       jupytext_version: 1.2.3
 #   kernelspec:
 #     display_name: Python 3
 #     language: python
@@ -46,7 +46,6 @@
 import HARK.ConsumptionSaving.ConsumerParameters as Params
 
 from HARK.utilities import approxUniform, getLorenzShares, calcSubpopAvg
-from time import clock
 mystr = lambda number : "{:.4f}".format(number)
 
 # %% {"code_folding": [1]}

diff --git a/notebooks/IndShockConsumerType.ipynb b/notebooks/IndShockConsumerType.ipynb
@@ -21,7 +21,6 @@
     "# Initial imports and notebook setup, click arrow to show\n",
     "from HARK.ConsumptionSaving.ConsIndShockModel import IndShockConsumerType\n",
     "from HARK.utilities import plotFuncsDer, plotFuncs\n",
-    "from time import clock\n",
     "import matplotlib.pyplot as plt\n",
     "import numpy as np\n",
     "mystr = lambda number : \"{:.4f}\".format(number)"
@@ -641,7 +640,7 @@
    }
   },
   "jupytext": {
-   "cell_metadata_filter": "collapsed,code_folding",
+   "cell_metadata_filter": "collapsed,code_folding,heading_collapsed,hidden",
    "formats": "ipynb,py:percent"
   },
   "kernelspec": {
@@ -692,5 +691,5 @@
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }
diff --git a/notebooks/IndShockConsumerType.py b/notebooks/IndShockConsumerType.py
@@ -1,13 +1,13 @@
 # ---
 # jupyter:
 #   jupytext:
-#     cell_metadata_filter: collapsed,code_folding
+#     cell_metadata_filter: collapsed,code_folding,heading_collapsed,hidden
 #     formats: ipynb,py:percent
 #     text_representation:
 #       extension: .py
 #       format_name: percent
 #       format_version: '1.2'
-#       jupytext_version: 1.1.3
+#       jupytext_version: 1.2.3
 #   kernelspec:
 #     display_name: Python 3
 #     language: python
@@ -22,7 +22,6 @@
 # Initial imports and notebook setup, click arrow to show
 from HARK.ConsumptionSaving.ConsIndShockModel import IndShockConsumerType
 from HARK.utilities import plotFuncsDer, plotFuncs
-from time import clock
 import matplotlib.pyplot as plt
 import numpy as np
 mystr = lambda number : "{:.4f}".format(number)

diff --git a/notebooks/KinkedRconsumerType.ipynb b/notebooks/KinkedRconsumerType.ipynb
@@ -20,7 +20,6 @@
     "# Initial imports and notebook setup, click arrow to show\n",
     "from HARK.ConsumptionSaving.ConsIndShockModel import KinkedRconsumerType\n",
     "from HARK.utilities import plotFuncsDer, plotFuncs\n",
-    "from time import clock\n",
     "import matplotlib.pyplot as plt\n",
     "import numpy as np\n",
     "mystr = lambda number : \"{:.4f}\".format(number)"
@@ -365,5 +364,5 @@
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }