ogeth 0.0.1__tar.gz → 0.0.2__tar.gz

{ogeth-0.0.1/ogeth.egg-info → ogeth-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ogeth
-Version: 0.0.1
+Version: 0.0.2
 Summary: Ethiopia Calibration for OG-Core
 Home-page: https://github.com/EAPD-DRB/OG-ETH/
 Download-URL: https://github.com/EAPD-DRB/OG-ETH/

{ogeth-0.0.1 → ogeth-0.0.2}/ogeth/__init__.py

@@ -8,4 +8,4 @@ from ogeth.input_output import *
 from ogeth.macro_params import *
 from ogeth.utils import *
 
-__version__ = "0.0.1"
+__version__ = "0.0.2"

{ogeth-0.0.1 → ogeth-0.0.2}/ogeth/constants.py

@@ -347,7 +347,7 @@ CONS_DICT = {
         "cpadm",
         "ceduc",
         "cheal",
-        "cosrv"
+        "cosrv",
         "celec",
         "cwatr",
     ],

{ogeth-0.0.1 → ogeth-0.0.2}/ogeth/income.py

@@ -12,7 +12,9 @@ CUR_PATH = os.path.abspath(os.path.dirname(__file__))
 OUTPUT_DIR = os.path.join(CUR_PATH, "OUTPUT", "ability")
 
 
-def get_e_interp(E, S, J, lambdas, age_wgts, gini_to_match=31.1, plot_path=None):
+def get_e_interp(
+    E, S, J, lambdas, age_wgts, gini_to_match=31.1, plot_path=None
+):
     """
     This function takes the calibrated lifetime earnings profiles
     (abilities, e matrix) from OG-USA and then adjusts the shape of those
@@ -196,4 +198,4 @@ def get_e_interp(E, S, J, lambdas, age_wgts, gini_to_match=31.1, plot_path=None)
                 **kwargs,
             )
 
-    return emat_new_scaled
+    return emat_new_scaled

{ogeth-0.0.1 → ogeth-0.0.2}/ogeth/input_output.py

@@ -87,4 +87,4 @@ def get_io_matrix(sam=SAM, cons_dict=CONS_DICT, prod_dict=PROD_DICT):
     # change from levels to share (where each row sums to one)
     io_df = io_df.div(io_df.sum(axis=1), axis=0)
 
-    return io_df
+    return io_df

{ogeth-0.0.1 → ogeth-0.0.2/ogeth.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ogeth
-Version: 0.0.1
+Version: 0.0.2
 Summary: Ethiopia Calibration for OG-Core
 Home-page: https://github.com/EAPD-DRB/OG-ETH/
 Download-URL: https://github.com/EAPD-DRB/OG-ETH/

{ogeth-0.0.1 → ogeth-0.0.2}/ogeth.egg-info/SOURCES.txt

@@ -19,7 +19,5 @@ ogeth.egg-info/dependency_links.txt
 ogeth.egg-info/requires.txt
 ogeth.egg-info/top_level.txt
 ogeth/data/IFPRI_SAM_ETH_2022_SAM.csv
-tests/test_income.py
-tests/test_input_output.py
 tests/test_macro_params.py
 tests/test_run_example.py

{ogeth-0.0.1 → ogeth-0.0.2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as readme_file:
 
 setuptools.setup(
     name="ogeth",
-    version="0.0.1",
+    version="0.0.2",
     author="Marcelo LaFleur, Richard W. Evans, and Jason DeBacker",
     license="CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
     description="Ethiopia Calibration for OG-Core",

ogeth-0.0.1/tests/test_income.py

@@ -1,99 +0,0 @@
-"""
-Tests of income.py module
-"""
-
-import pytest
-import numpy as np
-from ogeth import income
-
-
-def test_arctan_func():
-    """
-    Test of arctan_func()
-    """
-    expected_vals = np.array([0.14677821, 0.083305594, 0.057901228])
-    xvals = np.array([1, 2, 3])
-    a = 1.3
-    b = 2.2
-    c = 0.5
-    test_vals = income.arctan_func(xvals, a, b, c)
-
-    assert np.allclose(test_vals, expected_vals)
-
-
-def test_arctan_deriv_func():
-    """
-    Test of arctan_deriv_func()
-    """
-    expected_vals = np.array([-0.109814991, -0.036400091, -0.017707961])
-    xvals = np.array([1, 2, 3])
-    a = 1.3
-    b = 2.2
-    c = 0.5
-    test_vals = income.arctan_deriv_func(xvals, a, b, c)
-
-    assert np.allclose(test_vals, expected_vals)
-
-
-def test_arc_error():
-    """
-    Test of arc_error()
-    """
-    expected_vals = np.array([30.19765553, -1.40779391, 14.19212336])
-    a = 1.3
-    b = 2.2
-    c = 0.5
-    abc_vals = (a, b, c)
-    first_point = 30.2
-    coef1 = 0.05995294
-    coef2 = -0.00004086
-    coef3 = -0.00000521
-    abil_deprec = 0.47
-    params = (first_point, coef1, coef2, coef3, abil_deprec)
-    test_vals = income.arc_error(abc_vals, params)
-
-    assert np.allclose(test_vals, expected_vals)
-
-
-@pytest.mark.local
-def test_arctan_fit():
-    """
-    Test arctan_fit() function
-    """
-    expected_vals = np.array(
-        [
-            30.19999399,
-            30.19998699,
-            30.19997918,
-            30.19997039,
-            30.19996043,
-            30.19994904,
-            30.1999359,
-            30.19992057,
-            30.19990246,
-            30.19988072,
-            30.19985415,
-            30.19982094,
-            30.19977824,
-            30.19972131,
-            30.1996416,
-            30.19952204,
-            30.19932277,
-            30.19892423,
-            30.19772859,
-            14.19399974,
-        ]
-    )
-    a = 1.3
-    b = 2.2
-    c = 0.5
-    init_guesses = (a, b, c)
-    first_point = 30.2
-    coef1 = 0.05995294
-    coef2 = -0.00004086
-    coef3 = -0.00000521
-    abil_deprec = 0.47
-    test_vals = income.arctan_fit(
-        first_point, coef1, coef2, coef3, abil_deprec, init_guesses
-    )
-    assert np.allclose(test_vals, expected_vals)

ogeth-0.0.1/tests/test_input_output.py

@@ -1,75 +0,0 @@
-"""
-Tests of input_output.py module
-"""
-
-import pandas as pd
-import pytest
-from ogeth import input_output as io
-
-
-sam_dict = {
-    # "index": ["Beer", "Chocolate", "Car", "House"],
-    "Ag": [30, 160, 0, 5],
-    "Mining": [10, 0, 100, 100],
-    "Manufacturing": [60, 40, 200, 295],
-    "total": [100, 200, 300, 400],
-    "row": [10, 20, 30, 40],
-}
-sam_df = pd.DataFrame(sam_dict, index=["Beer", "Chocolate", "Car", "House"])
-
-cons_dict = {"Food": ["Beer", "Chocolate"], "Non-food": ["Car", "House"]}
-
-prod_dict = {
-    "Primary": ["Ag", "Mining"],
-    "Secondary": ["Manufacturing"],
-}
-
-
-def test_read_sam():
-    """
-    Test of read_SAM() function
-    """
-    test_df = io.read_SAM()
-
-    assert isinstance(test_df, pd.DataFrame)
-
-
-@pytest.mark.parametrize(
-    "sam_df, cons_dict",
-    [
-        (sam_df, cons_dict),
-    ],
-    ids=["Test 1"],
-)
-def test_get_alpha_c(sam_df, cons_dict):
-    """
-    Test of get_alpha_c() function
-    """
-    test_dict = io.get_alpha_c(sam=sam_df, cons_dict=cons_dict)
-
-    assert isinstance(test_dict, dict)
-    assert list(test_dict.keys()).sort() == ["Food", "Non-food"].sort()
-    assert test_dict["Food"] == 270 / 900
-    assert test_dict["Non-food"] == 630 / 900
-
-
-@pytest.mark.parametrize(
-    "sam_df, cons_dict, prod_dict",
-    [
-        (sam_df, cons_dict, prod_dict),
-    ],
-    ids=["Test 1"],
-)
-def test_get_io_matrix(sam_df, cons_dict, prod_dict):
-    """
-    Test of get_io_matrix()
-    """
-    test_df = io.get_io_matrix(
-        sam=sam_df, cons_dict=cons_dict, prod_dict=prod_dict
-    )
-
-    assert isinstance(test_df, pd.DataFrame)
-    assert list(test_df.columns).sort() == ["Primary", "Secondary"].sort()
-    assert list(test_df.index).sort() == ["Food", "Non-food"].sort()
-    assert test_df.loc["Food", "Primary"] == 2 / 3
-    assert test_df.loc["Food", "Secondary"] == 1 / 3