make slice flexible

Author: jdebacker

ogcore/output_tables.py

@@ -1085,8 +1085,7 @@ def model_fit_table(
             model_val = tpi_output["r"][t]
         elif target_desc == r"Capital share of output":
             model_val = (
-                1
-                - tpi_output["r"][t] * tpi_output["K"][t] / tpi_output["Y"][t]
+                1 - tpi_output["w"][t] * tpi_output["L"][t] / tpi_output["Y"][t]
             )
         elif target_desc == r"Labor share of output":
             model_val = (
@@ -1135,12 +1134,9 @@ def model_fit_table(
             model_val = ineq.gini()
         # Demographic moments
         elif target_desc == r"Fraction 65+":
-            model_val = (
-                params.omega[
-                    t, -35:
-                ].sum()  # NOTE: not flexible with S, E changes
-                / params.omega[t].sum()
-            )
+            idx_65 = max(0, 65 - params.starting_age)
+            omega_t = params.omega[t]
+            model_val = omega_t[idx_65:].sum() / omega_t.sum()
         elif target_desc == r"Pop growth rate":
             model_val = params.g_n[t]
         else: