Merge pull request #1195 from AMonninger/ECB

Journey 3
econ-ark · Jan 13, 2023 · af14685 · af14685
2 parents 2fbfbc6 + b5ffd6d
commit af14685
Show file tree

Hide file tree

Showing 20 changed files with 624 additions and 41 deletions.
diff --git a/Documentation/example_notebooks/HARK-struct-2.png b/Documentation/example_notebooks/HARK-struct-2.png
@@ -0,0 +1 @@
+../../examples/Journeys/HARK-struct-2.png
diff --git a/Documentation/example_notebooks/HARK-struct-3.png b/Documentation/example_notebooks/HARK-struct-3.png
@@ -0,0 +1 @@
+../../examples/Journeys/HARK-struct-3.png
diff --git a/Documentation/example_notebooks/HARK-struct-4.png b/Documentation/example_notebooks/HARK-struct-4.png
@@ -0,0 +1 @@
+../../examples/Journeys/HARK-struct-4.png
diff --git a/Documentation/example_notebooks/HARK_struct_2.png b/Documentation/example_notebooks/HARK_struct_2.png
diff --git a/Documentation/example_notebooks/HARK_struct_3.png b/Documentation/example_notebooks/HARK_struct_3.png
diff --git a/Documentation/example_notebooks/HARK_struct_4.png b/Documentation/example_notebooks/HARK_struct_4.png
diff --git a/Documentation/example_notebooks/Journey-PhD.ipynb b/Documentation/example_notebooks/Journey-PhD.ipynb
@@ -0,0 +1 @@
+../../examples/Journeys/Journey-PhD.ipynb
diff --git a/Documentation/example_notebooks/JourneyPhDparam.py b/Documentation/example_notebooks/JourneyPhDparam.py
@@ -0,0 +1 @@
+../../examples/Journeys/JourneyPhDparam.py
diff --git a/Documentation/example_notebooks/Journey_1_PhD.ipynb b/Documentation/example_notebooks/Journey_1_PhD.ipynb
diff --git a/examples/Journeys/HAFiscalFig1.png b/examples/Journeys/HAFiscalFig1.png
diff --git a/examples/Journeys/HARK_ind_sh.png → examples/Journeys/HARK-ind-sh.png b/examples/Journeys/HARK_ind_sh.png → examples/Journeys/HARK-ind-sh.png
diff --git a/examples/Journeys/HARK_struct_2.png → examples/Journeys/HARK-struct-2.png b/examples/Journeys/HARK_struct_2.png → examples/Journeys/HARK-struct-2.png
diff --git a/examples/Journeys/HARK_struct_3.png → examples/Journeys/HARK-struct-3.png b/examples/Journeys/HARK_struct_3.png → examples/Journeys/HARK-struct-3.png
diff --git a/examples/Journeys/HARK_struct_4.png → examples/Journeys/HARK-struct-4.png b/examples/Journeys/HARK_struct_4.png → examples/Journeys/HARK-struct-4.png
diff --git a/...ys/Journey 2 Engineering Background.ipynb → ...neys/Journey-Engineering-Background.ipynb b/...ys/Journey 2 Engineering Background.ipynb → ...neys/Journey-Engineering-Background.ipynb
@@ -4,7 +4,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# Journey 2: Engineering background\n",
+    "# Journey: Engineering background\n",
     "\n",
     "This is a second of the possible journeys into HARK - the Python package designed to solve economic models with the heterogeneous agents. As it is a \"journey\", it is not a one big tutorial, but a set of the links to the notebooks/other resources which will help you understand the different HARK objects and functionalities.\n",
     "\n",
@@ -62,7 +62,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.6"
+   "version": "3.8.8"
   },
   "latex_envs": {
    "LaTeX_envs_menu_present": true,
@@ -94,6 +94,13 @@
    "toc_position": {},
    "toc_section_display": true,
    "toc_window_display": false
+  },
+  "widgets": {
+   "application/vnd.jupyter.widget-state+json": {
+    "state": {},
+    "version_major": 2,
+    "version_minor": 0
+   }
   }
  },
  "nbformat": 4,

diff --git a/examples/Journeys/Journey_1_PhD.ipynb → examples/Journeys/Journey-PhD.ipynb b/examples/Journeys/Journey_1_PhD.ipynb → examples/Journeys/Journey-PhD.ipynb
diff --git a/examples/Journeys/Journey-Policymaker.ipynb b/examples/Journeys/Journey-Policymaker.ipynb
diff --git a/examples/Journeys/Journey_1_param.py → examples/Journeys/JourneyPhDparam.py b/examples/Journeys/Journey_1_param.py → examples/Journeys/JourneyPhDparam.py
diff --git a/examples/Journeys/Journeys_into_HARK.ipynb → examples/Journeys/Journeys-into-HARK.ipynb b/examples/Journeys/Journeys_into_HARK.ipynb → examples/Journeys/Journeys-into-HARK.ipynb
@@ -22,7 +22,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Engineer's track\n",
+    "## [Engineer's track](Journey-Engineering-Background.ipynb)\n",
     "\n",
     "You are familiar with numerical simulations as well as object oriented programming and Python. However, you do not work (much) with economic problems. Thus we propose you a quick tutorials to get used to the models and the basic classes of HARK\n"
    ]
@@ -36,16 +36,18 @@
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": null,
+   "cell_type": "markdown",
    "metadata": {},
-   "outputs": [],
-   "source": []
+   "source": [
+    "## [Policymaker track](Journey-Policymaker.ipynb)\n",
+    "\n",
+    "You have some knowledge in economic theory and would like to use HARK to solve for general equilibrium HANK models. This journey introduces HARK and shows how to combine it with the [sequence space jacobian toolbox](https://github.com/shade-econ/sequence-jacobian) in order to create a HANK model."
+   ]
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -59,7 +61,14 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.12"
+   "version": "3.8.11"
+  },
+  "widgets": {
+   "application/vnd.jupyter.widget-state+json": {
+    "state": {},
+    "version_major": 2,
+    "version_minor": 0
+   }
   }
  },
  "nbformat": 4,

diff --git a/examples/Journeys/LorenzcurveDiscRate.png b/examples/Journeys/LorenzcurveDiscRate.png