Update for Hark 0.10.6 (#116)

* changes to support HARK 0.10.6 * more changes to prepare DemARKS for 0.10.6 * no KrusellSmith * remove Uncertainty and the Savings Rate. see #117 * fixing ChineseGrowth w/r/t discretizing continuous distributions and internalized constructLogNormalIncomeProcess * updating Micro-and-Macro ; Structural-Estimates, for cstwMPC removal and discretization * remove Untitled failing notebook * fixing DemARKs that used approxUniform
econ-ark · May 21, 2020 · 3643f4f · 3643f4f
1 parent d313b6c
commit 3643f4f
Show file tree

Hide file tree

Showing 28 changed files with 3,278 additions and 4,105 deletions.
diff --git a/notebooks/Alternative-Combos-Of-Parameter-Values.ipynb b/notebooks/Alternative-Combos-Of-Parameter-Values.ipynb
@@ -145,7 +145,6 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "\r",
       "  0%|          | 0/1 [00:00<?, ?it/s]"
      ]
     },
@@ -162,7 +161,7 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "100%|██████████| 1/1 [00:04<00:00,  4.33s/it]\n"
+      "100%|██████████| 1/1 [00:04<00:00,  4.71s/it]\n"
      ]
     }
    ],
@@ -349,7 +348,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.6"
+   "version": "3.6.9"
   },
   "latex_envs": {
    "LaTeX_envs_menu_present": true,

diff --git a/notebooks/Alternative-Combos-Of-Parameter-Values.py b/notebooks/Alternative-Combos-Of-Parameter-Values.py
@@ -8,7 +8,7 @@
 #       extension: .py
 #       format_name: light
 #       format_version: '1.4'
-#       jupytext_version: 1.2.3
+#       jupytext_version: 1.2.4
 #   kernelspec:
 #     display_name: Python 3
 #     language: python
@@ -22,7 +22,7 @@
 #     name: python
 #     nbconvert_exporter: python
 #     pygments_lexer: ipython3
-#     version: 3.7.6
+#     version: 3.6.9
 #   latex_envs:
 #     LaTeX_envs_menu_present: true
 #     autoclose: false

diff --git a/notebooks/Chinese-Growth.ipynb b/notebooks/Chinese-Growth.ipynb
diff --git a/notebooks/Chinese-Growth.py b/notebooks/Chinese-Growth.py
@@ -170,11 +170,11 @@
 # First, decide the discount factors to assign:
 
 # %%
-from HARK.utilities import approxUniform
+from HARK.distribution import Uniform
 
 bottomDiscFac = 0.9800
 topDiscFac    = 0.9934 
-DiscFac_list  = approxUniform(N=num_consumer_types,bot=bottomDiscFac,top=topDiscFac)[1]
+DiscFac_list  = Uniform(bot=bottomDiscFac,top=topDiscFac).approx(N=num_consumer_types).X
 
 # Now, assign the discount factors we want to the ChineseConsumerTypes
 for j in range(num_consumer_types):
@@ -193,10 +193,10 @@
 
 # %% {"code_folding": []}
 # First create the income distribution in the low-growth state, which we will not change
-from HARK.ConsumptionSaving.ConsIndShockModel import IndShockConsumerType, constructLognormalIncomeProcessUnemployment
+from HARK.ConsumptionSaving.ConsIndShockModel import IndShockConsumerType
 
 low_growth_model = IndShockConsumerType()
-LowGrowthIncomeDstn  = constructLognormalIncomeProcessUnemployment(low_growth_model)[0][0]
+LowGrowthIncomeDstn  = low_growth_model.constructLognormalIncomeProcessUnemployment()[0][0]
 
 # Remember the standard deviation of the permanent income shock in the low-growth state for later
 LowGrowth_PermShkStd = low_growth_model.PermShkStd
@@ -233,7 +233,7 @@ def calcNatlSavingRate(PrmShkVar_multiplier,RNG_seed = 0):
     low_growth_model.PermShkStd = [LowGrowth_PermShkStd[0] * PrmShkStd_multiplier] 
 
     # Construct the appropriate income distributions
-    HighGrowthIncomeDstn = constructLognormalIncomeProcessUnemployment(low_growth_model)[0][0]
+    HighGrowthIncomeDstn = low_growth_model.constructLognormalIncomeProcessUnemployment()[0][0]
 
     # To calculate the national saving rate, we need national income and national consumption
     # To get those, we are going to start national income and consumption at 0, and then

diff --git a/notebooks/Figures/Uncertainty-and-the-Saving-Rate-BvsPermShkVar.pdf b/notebooks/Figures/Uncertainty-and-the-Saving-Rate-BvsPermShkVar.pdf
diff --git a/notebooks/Figures/Uncertainty-and-the-Saving-Rate-BvsPermShkVar.png b/notebooks/Figures/Uncertainty-and-the-Saving-Rate-BvsPermShkVar.png
diff --git a/notebooks/Figures/Uncertainty-and-the-Saving-Rate-BvsPermShkVar.svg b/notebooks/Figures/Uncertainty-and-the-Saving-Rate-BvsPermShkVar.svg
diff --git a/notebooks/Figures/Uncertainty-and-the-Saving-Rate-BvsTranShkVar.pdf b/notebooks/Figures/Uncertainty-and-the-Saving-Rate-BvsTranShkVar.pdf
diff --git a/notebooks/Figures/Uncertainty-and-the-Saving-Rate-BvsTranShkVar.png b/notebooks/Figures/Uncertainty-and-the-Saving-Rate-BvsTranShkVar.png
diff --git a/notebooks/Figures/Uncertainty-and-the-Saving-Rate-BvsTranShkVar.svg b/notebooks/Figures/Uncertainty-and-the-Saving-Rate-BvsTranShkVar.svg
diff --git a/notebooks/Figures/Uncertainty-and-the-Saving-Rate-savRteVSTranShkVar.pdf b/notebooks/Figures/Uncertainty-and-the-Saving-Rate-savRteVSTranShkVar.pdf
diff --git a/notebooks/Figures/Uncertainty-and-the-Saving-Rate-savRteVSTranShkVar.png b/notebooks/Figures/Uncertainty-and-the-Saving-Rate-savRteVSTranShkVar.png
diff --git a/notebooks/Figures/Uncertainty-and-the-Saving-Rate-savRteVSTranShkVar.svg b/notebooks/Figures/Uncertainty-and-the-Saving-Rate-savRteVSTranShkVar.svg
diff --git a/notebooks/Figures/Uncertainty-and-the-Saving-Rate-savRtevsPermShkVar.pdf b/notebooks/Figures/Uncertainty-and-the-Saving-Rate-savRtevsPermShkVar.pdf
diff --git a/notebooks/Figures/Uncertainty-and-the-Saving-Rate-savRtevsPermShkVar.png b/notebooks/Figures/Uncertainty-and-the-Saving-Rate-savRtevsPermShkVar.png