temp commit

Author: jdebacker

ogcore/aggregates.py

@@ -134,9 +134,9 @@ def get_B(b, p, method, preTP):
             part1 = b * np.transpose(p.omega_S_preTP * p.lambdas)
             omega_extended = np.append(p.omega_S_preTP[1:], [0.0])
             imm_extended = np.append(
-                p.imm_rates_pre_TP[1:], [0.0]
+                p.imm_rates_preTP[1:], [0.0]
             )
-            pop_growth_rate = p.g_n_pretP
+            pop_growth_rate = p.g_n_preTP
         else:
             part1 = b * np.transpose(p.omega_SS * p.lambdas)
             omega_extended = np.append(p.omega_SS[1:], [0.0])

ogcore/default_parameters.json

@@ -4586,7 +4586,7 @@
             }
         }
     },
-    "imm_rates_pre_TP": {
+    "imm_rates_preTP": {
         "title": "Immigration rates in period before model start year",
         "description": "Immigration rates in period before model start year.",
         "section_1": "Demographic Parameters",

ogcore/demographics.py

@@ -388,8 +388,8 @@ def get_pop(
             pre_pop_data = get_un_data(
                 "47",
                 country_id=country_id,
-                start_year=start_year - 1,
-                end_year=start_year - 1,
+                start_year=start_year,
+                end_year=start_year,
             )
             if download_path:
                 pre_pop_data.to_csv(
@@ -893,7 +893,7 @@ def get_pop_objs(
                 initial_pop,
                 pre_pop_dist,
                 country_id,
-                start_data_year,
+                initial_data_year,  # TODO: should this be start_data_year?
                 final_data_year,
                 download_path=download_path,
             )
@@ -1319,7 +1319,7 @@ def get_pop_objs(
         "omega_S_preTP": omega_path_S[0, :],
         "imm_rates_preTP": imm_rates_mat[0, :],
         "rho_preTP": mort_rates_S[0, :],
-        "g_m_preTP": g_n_path[0],
+        "g_n_preTP": g_n_path[0],
     }
 
     return pop_dict

tests/test_demographics.py

@@ -563,14 +563,17 @@ def test_data_download(tmpdir):
         infmort_rates=infmort_rates[1:],
         imm_rates=imm_rates[1:, :],
         infer_pop=True,
-        pop_dist=pop_dist[0, :].reshape(1, E + S),
-        pre_pop_dist=pre_pop_dist,
+        pop_dist=pop_dist[1, :].reshape(1, E + S),
+        pre_pop_dist=pop_dist[0, :],  # pre_pop_dist,
         initial_data_year=start_year,
         final_data_year=start_year + 1,
         GraphDiag=False,
     )
 
     # Assert that the two pop_dicts are the same
+    for key in pop_dict:
+        print(key)
+        print("Diff =", np.abs(pop_dict[key] - pop_dict2[key]).max())
     for key in pop_dict:
         print(key)
         assert np.allclose(pop_dict[key], pop_dict2[key])