Merge remote-tracking branch 'origin/prepop' into prepop

Author: jdebacker

ogcore/demographics.py

@@ -991,7 +991,7 @@ def get_pop_objs(
     assert np.allclose(pop_counter_2D, pop_2D)
 
     # """"
-    # CHANGE - in OG-Core, we are implicitLy assuming pre-TP rates of mortality,
+    # CHANGE - in OG-Core, we are implicitly assuming pre-TP rates of mortality,
     # fertility, and immigration are the same as the period 0 rates.
 
     # So let's just infer the pre-pop_dist from those.
@@ -1062,17 +1062,17 @@ def get_pop_objs(
     newborns = (fert_rates[0, :] * pre_pop_EpS[:]).sum()
     initial_pop_counter[0] = (
          1 - infmort_rates[0]
-     ) * newborns + imm_rates_orig[0, 0] * pre_pop_EpS[0]
+    ) * newborns + imm_rates_orig[0, 0] * pre_pop_EpS[0]
     initial_pop_counter[1:] = (
          pre_pop_EpS[:-1] * (1 - mort_rates[0, :-1])
          + pre_pop_EpS[1:] * imm_rates_orig[0, 1:]
-     )
+    )
 
     max_diff = np.abs(pop_2D[0, :] - initial_pop_counter).max()
     print(
          "Pre-period population verification: Max diff = ",
          max_diff
-     )
+    )
 
     if max_diff > 100_000:
         print(
@@ -1081,7 +1081,7 @@ def get_pop_objs(
              + "This may indicate inconsistencies in the data or "
              + "immigration rate calculations, but using UN historical "
              + "data as it is more reliable than backward-solved estimates."
-         )
+        )
 
     # Create the transition matrix for the population distribution
     # from T0 going forward (i.e., past when we have data on forecasts)