update figures

econ-ark · Feb 1, 2024 · 2a5c67a · 2a5c67a
1 parent 459613f
commit 2a5c67a
Show file tree

Hide file tree

Showing 13 changed files with 98 additions and 21 deletions.
diff --git a/code/IndShock.ipynb b/code/IndShock.ipynb
@@ -17,7 +17,8 @@
                 "from estimark.agents import IndShkLifeCycleConsumerType\n",
                 "import estimark.calibration.estimation_parameters as parameters\n",
                 "import numpy as np\n",
-                "from HARK.utilities import plot_funcs"
+                "from HARK.utilities import plot_funcs\n",
+                "import matplotlib.pyplot as plt"
             ]
         },
         {
@@ -68,7 +69,8 @@
                 }
             ],
             "source": [
-                "plot_funcs([sol.cFunc for sol in indshk_agent.solution[:-1:5]], 0, 20)"
+                "plot_funcs([sol.cFunc for sol in indshk_agent.solution[:-1:5]], 0, 20)\n",
+                "plt.savefig(\"../content/figures/IndShock_cFunc.png\")"
             ]
         },
         {

diff --git a/code/Portfolio.ipynb b/code/Portfolio.ipynb
@@ -17,7 +17,8 @@
     "from estimark.agents import PortfolioLifeCycleConsumerType\n",
     "import estimark.calibration.estimation_parameters as parameters\n",
     "import numpy as np\n",
-    "from HARK.utilities import plot_funcs"
+    "from HARK.utilities import plot_funcs\n",
+    "import matplotlib.pyplot as plt"
    ]
   },
   {
@@ -37,11 +38,13 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "portfolio_agent = PortfolioLifeCycleConsumerType(**parameters.init_consumer_objects)\n",
+    "portfolio_agent = PortfolioLifeCycleConsumerType(\n",
+    "    **parameters.init_consumer_objects)\n",
     "\n",
     "\n",
     "portfolio_agent.CRRA = CRRA\n",
     "\n",
+    "\n",
     "portfolio_agent.DiscFac = [b * DiscFacAdj for b in parameters.DiscFac_timevary]"
    ]
   },
@@ -71,7 +74,8 @@
     }
    ],
    "source": [
-    "plot_funcs([sol.cFunc for sol in portfolio_agent.solution[:-1:5]], 0, 20)"
+    "plot_funcs([sol.cFunc for sol in portfolio_agent.solution[:-1:5]], 0, 20)\n",
+    "plt.savefig(\"../content/figures/IndShockPortfolio_cFunc.png\")"
    ]
   },
   {
@@ -91,7 +95,8 @@
     }
    ],
    "source": [
-    "plot_funcs([sol.ShareFuncAdj for sol in portfolio_agent.solution[:-1:5]], 0, 100)"
+    "plot_funcs([sol.ShareFuncAdj for sol in portfolio_agent.solution[:-1:5]], 0, 100)\n",
+    "plt.savefig(\"../content/figures/IndShockPortfolio_ShareFunc.png\")"
    ]
   }
  ],

diff --git a/code/WarmGlow.ipynb b/code/WarmGlow.ipynb
@@ -2,19 +2,28 @@
     "cells": [
         {
             "cell_type": "code",
-            "execution_count": 3,
+            "execution_count": 1,
             "metadata": {},
-            "outputs": [],
+            "outputs": [
+                {
+                    "name": "stdout",
+                    "output_type": "stream",
+                    "text": [
+                        "***NOTE: using a 'quick fix' for an attribute error. See 'Error Notes' in EstimationParameter.py for further discussion.***\n"
+                    ]
+                }
+            ],
             "source": [
                 "from estimark.agents import BequestWarmGlowLifeCycleConsumerType\n",
                 "import estimark.calibration.estimation_parameters as parameters\n",
                 "import numpy as np\n",
-                "from HARK.utilities import plot_funcs"
+                "from HARK.utilities import plot_funcs\n",
+                "import matplotlib.pyplot as plt"
             ]
         },
         {
             "cell_type": "code",
-            "execution_count": 4,
+            "execution_count": 2,
             "metadata": {},
             "outputs": [],
             "source": [
@@ -25,7 +34,7 @@
         },
         {
             "cell_type": "code",
-            "execution_count": 5,
+            "execution_count": 3,
             "metadata": {},
             "outputs": [],
             "source": [
@@ -39,7 +48,7 @@
         },
         {
             "cell_type": "code",
-            "execution_count": 6,
+            "execution_count": 4,
             "metadata": {},
             "outputs": [],
             "source": [
@@ -48,7 +57,7 @@
         },
         {
             "cell_type": "code",
-            "execution_count": 7,
+            "execution_count": 5,
             "metadata": {},
             "outputs": [
                 {
@@ -63,7 +72,8 @@
                 }
             ],
             "source": [
-                "plot_funcs([sol.cFunc for sol in portfolio_agent.solution[:-1:5]], 0, 20)"
+                "plot_funcs([sol.cFunc for sol in portfolio_agent.solution[:-1:5]], 0, 20)\n",
+                "plt.savefig(\"../content/figures/WarmGlowIndShock_cFunc.png\")"
             ]
         }
     ],

diff --git a/code/WarmGlowPortfolio.ipynb b/code/WarmGlowPortfolio.ipynb
diff --git a/code/WealthPortfolio.ipynb b/code/WealthPortfolio.ipynb
diff --git a/content/figures/IndShockPortfolio_ShareFunc.png b/content/figures/IndShockPortfolio_ShareFunc.png
diff --git a/content/figures/IndShockPortfolio_cFunc.png b/content/figures/IndShockPortfolio_cFunc.png
diff --git a/content/figures/IndShock_cFunc.png b/content/figures/IndShock_cFunc.png
diff --git a/content/figures/TRPPortfolio_ShareFunc.png b/content/figures/TRPPortfolio_ShareFunc.png
diff --git a/content/figures/TRPPortfolio_cFunc.png b/content/figures/TRPPortfolio_cFunc.png
diff --git a/content/figures/WarmGlowIndShockPortfolio_ShareFunc.png b/content/figures/WarmGlowIndShockPortfolio_ShareFunc.png
diff --git a/content/figures/WarmGlowIndShockPortfolio_cFunc.png b/content/figures/WarmGlowIndShockPortfolio_cFunc.png
diff --git a/content/figures/WarmGlowIndShock_cFunc.png b/content/figures/WarmGlowIndShock_cFunc.png