Merge pull request #23 from jdebacker/demog_core

Use `demographics.py` from OG-Core

PSL_catalog.json

@@ -1,6 +1,6 @@
 {
     "name": "OG-IND",
-    "img": "https://github.com/Revenue-Academy/OG-IND/blob/main/docs/OG-IND_logo.png?raw=true",
+    "img": "https://raw.githubusercontent.com/Revenue-Academy/OG-IND/main/docs/OG-IND_logo.png",
     "banner_title": "OG-IND",
     "banner_subtitle": "A large-scale, open source, overlapping generations model of India",
     "detailed_description": "OG-IND is an overlapping-generations (OG) model that allows for dynamic general equilibrium analysis of fiscal policy for India. OG-IND is built on the OG-Core framework. The model output includes changes in macroeconomic aggregates (GDP, investment, consumption), wages, interest rates, and the stream of tax revenues over time. Regularly updated documentation of the model theory--its output, and solution method--and the Python API is available at https://pslmodels.github.io/OG-Core and documentation of the specific Indian calibration of the model will be available soon.",

environment.yml

@@ -2,7 +2,7 @@ name: ogind-dev
 channels:
 - conda-forge
 dependencies:
-- python>=3.7.7, <3.12
+- python<3.12
 - ipython
 - setuptools
 - psutil

ogind/calibrate.py

@@ -1,7 +1,7 @@
-from ogind import demographics, macro_params, get_micro_data, income
+from ogind import macro_params, get_micro_data, income
 import os
 import numpy as np
-from ogcore import txfunc
+from ogcore import txfunc, demographics
 from ogcore.utils import safe_read_pickle, mkdirs
 
 
@@ -58,11 +58,11 @@ def __init__(
             p.E,
             p.S,
             p.T,
-            1,
-            100,
-            p.start_year - 1,
-            p.start_year,
-            GraphDiag=True,
+            0,
+            99,
+            country_id="356",
+            initial_data_year=p.start_year - 1,
+            final_data_year=p.start_year,
         )
 
         # earnings profiles