Merge remote-tracking branch 'origin/main'

jessegrabowski · Jan 24, 2024 · 90fb41f · 90fb41f
2 parents b93fa0a + 9c2e476
commit 90fb41f
Show file tree

Hide file tree

Showing 8 changed files with 2,192 additions and 544 deletions.
diff --git a/...oks/10 - Factor Tax - Automatic Sam.ipynb → ...oks/03 - Factor Tax - Automatic Sam.ipynb b/...oks/10 - Factor Tax - Automatic Sam.ipynb → ...oks/03 - Factor Tax - Automatic Sam.ipynb
@@ -223,7 +223,6 @@
     "    ## Value chain process (intermediate goods bundle)\n",
     "    Equation(\n",
     "        \"Sector <dim:i> production of intermediate goods bundle\",\n",
-    "        #              'VC * P_VC = (P[:, None] * X).sum(axis=0).ravel()'),\n",
     "        \"VC * P_VC = Sum(P_Y.subs({i:j}) * X.subs([(i,k), (j,i), (k,j)]), \"\n",
     "        + f\"(j, 0, {n_sectors - 1}))\",\n",
     "    ),\n",
@@ -247,13 +246,6 @@
     "        equation=\"L_d = VA / A * ((1 - alpha) * A * P_VA / w_star) ** epsilon\",\n",
     "    ),\n",
     "    Equation(name=\"Sector <dim:i> investment demand\", equation=\"I_d = alpha_I * I_s\"),\n",
-    "    # Household equations\n",
-    "    #     Equation('Utility',\n",
-    "    #              #'U = (alpha_C * C ** ((epsilon_C) / (epsilon_C - 1))).sum()'\n",
-    "    #              f'U = Sum(alpha_C * C ** ((epsilon_C - 1) / epsilon_C), (i, 0, {n_sectors - 1})) ** (epsilon_C / (epsilon_C - 1))'\n",
-    "    #             ),\n",
-    "    #     Equation(name='Household demand for good <dim:i>',\n",
-    "    #             equation=f'C = (alpha_C * P) ** (-epsilon_C) / Sum(alpha_C ** (-epsilon_C) * P ** (1 - epsilon_C), (i, 0, {n_sectors - 1})) * mpc * net_income '),\n",
     "    Equation(name=\"Utility\", equation=f\"U = Product(C ** alpha_C, (i, 0, {n_sectors - 1}))\"),\n",
     "    Equation(\n",
     "        name=\"Household demand for good <dim:i>\", equation=\"P * C = alpha_C * net_income * mpc\"\n",
@@ -268,7 +260,6 @@
     "    Equation(\n",
     "        name=\"Government budget constraint\",\n",
     "        equation=\"G + I_G = tau_income * income + \"\n",
-    "        #                       \"(tau_sales * P_Y  * Y + tau_capital * r * K_d + tau_wage * w * L_d).sum()\"\n",
     "        f\"Sum(tau_sales * P_Y  * C + tau_capital * r * K_d + tau_wage * w * L_d, (i, 0, {n_sectors - 1}))\",\n",
     "    ),\n",
     "    Equation(\"Government consumption of <dim:i> sector goods\", \"C_G = alpha_G * G\"),\n",

diff --git a/notebooks/04 - Energy Endog L.ipynb b/notebooks/04 - Energy Endog L.ipynb
diff --git a/notebooks/06 - Benchmark Energy Endog L-Copy1.ipynb b/notebooks/06 - Benchmark Energy Endog L-Copy1.ipynb
diff --git a/notebooks/08 - Seperate Energy Sector and two VC.ipynb b/notebooks/08 - Seperate Energy Sector and two VC.ipynb
@@ -928,17 +928,21 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 10,
    "id": "43103bbb",
    "metadata": {
     "tags": []
    },
    "outputs": [
     {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "2263.9607422136332\n"
+     "ename": "NameError",
+     "evalue": "name 'initial_data' is not defined",
+     "output_type": "error",
+     "traceback": [
+      "\u001b[1;31m---------------------------------------------------------------------------\u001b[0m",
+      "\u001b[1;31mNameError\u001b[0m                                 Traceback (most recent call last)",
+      "Cell \u001b[1;32mIn[10], line 2\u001b[0m\n\u001b[0;32m      1\u001b[0m calibrated_data \u001b[38;5;241m=\u001b[39m calibrate_model(\n\u001b[1;32m----> 2\u001b[0m     \u001b[38;5;241m*\u001b[39m\u001b[38;5;241m*\u001b[39m(\u001b[43minitial_data\u001b[49m \u001b[38;5;241m|\u001b[39m econometric_estimates), variables\u001b[38;5;241m=\u001b[39mmod\u001b[38;5;241m.\u001b[39mvariables, parameters\u001b[38;5;241m=\u001b[39mmod\u001b[38;5;241m.\u001b[39mparameters\n\u001b[0;32m      3\u001b[0m )\n",
+      "\u001b[1;31mNameError\u001b[0m: name 'initial_data' is not defined"
      ]
     }
    ],