PSLmodels / CGE

An Open Source Computational General Equilibrium Model
https://pslmodels.github.io/CGE/
Creative Commons Zero v1.0 Universal
21 stars 30 forks source link

Create separate function to compute disposable income #11

Closed jdebacker closed 5 years ago

jdebacker commented 6 years ago

The function for consumer demand for commodity i, CGE_equations.eqXp(), is given as:

Xp = alpha * ((pf * Ff).sum() - Sp - Td - Fsh + Trf) / pq

The term in brackets, ((pf * Ff).sum() - Sp - Td - Fsh + Trf) is equal to I.

It might be easier to think about how this function matches up to the theory if I were computed in a separate function and passed to the eqXp() equation.

duncanhobbs commented 5 years ago

Do you want me to add this function to household.py as well since the functions are split into separate modules?

jdebacker commented 5 years ago

@duncanhobbs, That'd be great. I think we will be removing equations.py soon and keeping the functions in separate modules to help with organization.