Merge pull request #250 from econ-ark/May1update

Revise `calc_expectation` to `expected`

Author: mnwhite

notebooks/LC-Model-Expected-Vs-Realized-Income-Growth.ipynb

@@ -27,7 +27,7 @@
    "source": [
     "import statsmodels.api as sm\n",
     "from linearmodels.panel.model import PanelOLS\n",
-    "from HARK.distributions import calc_expectation\n",
+    "from HARK.distributions import expected\n",
     "from HARK.ConsumptionSaving.ConsIndShockModel import (\n",
     "    IndShockConsumerType,\n",
     "    init_lifecycle,\n",
@@ -188,7 +188,7 @@
    "outputs": [],
    "source": [
     "exp = [\n",
-    "    calc_expectation(Agent.IncShkDstn[i], func=lambda x: x[\"PermShk\"] * x[\"TranShk\"])\n",
+    "    expected(dstn=Agent.IncShkDstn[i], func=lambda x: x[\"PermShk\"] * x[\"TranShk\"])\n",
     "    for i in range(Agent.T_cycle)\n",
     "]\n",
     "exp_df = pd.DataFrame(\n",
@@ -249,8 +249,8 @@
       "Dep. Variable:                 ExpBin   R-squared:                        0.1958\n",
       "Estimator:                   PanelOLS   R-squared (Between):             -0.0938\n",
       "No. Observations:              100000   R-squared (Within):               0.1958\n",
-      "Date:                Mon, Feb 02 2026   R-squared (Overall):              0.1888\n",
-      "Time:                        21:29:53   Log-likelihood                -1.288e+05\n",
+      "Date:                Thu, Apr 30 2026   R-squared (Overall):              0.1888\n",
+      "Time:                        21:39:45   Log-likelihood                -1.288e+05\n",
       "Cov. Estimator:            Unadjusted                                           \n",
       "                                        F-statistic:                   2.376e+04\n",
       "Entities:                        2435   P-value                           0.0000\n",
@@ -332,7 +332,7 @@
    "outputs": [],
    "source": [
     "exp = [\n",
-    "    calc_expectation(Agent_nt.IncShkDstn[i], func=lambda x: x[\"PermShk\"] * x[\"TranShk\"])\n",
+    "    expected(dstn=Agent_nt.IncShkDstn[i], func=lambda x: x[\"PermShk\"] * x[\"TranShk\"])\n",
     "    for i in range(Agent_nt.T_cycle)\n",
     "]\n",
     "exp_df = pd.DataFrame(\n",
@@ -381,8 +381,8 @@
       "Dep. Variable:                 ExpBin   R-squared:                        0.0084\n",
       "Estimator:                   PanelOLS   R-squared (Between):             -0.0257\n",
       "No. Observations:              100000   R-squared (Within):               0.0084\n",
-      "Date:                Mon, Feb 02 2026   R-squared (Overall):              0.0088\n",
-      "Time:                        21:29:58   Log-likelihood                -1.393e+05\n",
+      "Date:                Thu, Apr 30 2026   R-squared (Overall):              0.0088\n",
+      "Time:                        21:39:49   Log-likelihood                -1.393e+05\n",
       "Cov. Estimator:            Unadjusted                                           \n",
       "                                        F-statistic:                      826.23\n",
       "Entities:                        2435   P-value                           0.0000\n",