Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Empowerment calibration #240

Open
wants to merge 34 commits into
base: main
Choose a base branch
from
Open

Empowerment calibration #240

wants to merge 34 commits into from

Conversation

emilydriano
Copy link
Collaborator

@emilydriano emilydriano commented Jan 24, 2024 •
edited

Brief description

Adds empowerment targets (paid work and educational attainment) to the experiment class when used by the autocalibration feature. Also creates an 'empowerment_calibration' script to be used for calibrating the Kenya model with the empowerment module.

Type(s) of change

  • Bugfix
  • Refactor
  • New feature
  • [ X ] Other - expansion upon calibration using empowerment attributes of paid work and education attainment as targets

Checklist

  • My code follows the style guide
    • [ X ] Yes
    • N/A
  • I've commented my code
    • Yes
    • N/A
  • I've incremented the version number
    • Yes
    • N/A
  • I've updated the changelog
    • Yes
    • N/A
  • I've added tests and checked code coverage
    • Yes
    • N/A

mzimmermann-IDM and others added 30 commits August 21, 2023 16:05
@mzimmermann-IDM
Pull DHS data from empowerment metrics
075cac7
@mzimmermann-IDM
update method for young women
25289a1
@pausz
Merge remote-tracking branch 'origin/Kenya_empowerment_DHS' into empo…
d2a302e 
…werment
@pausz
Include new empowerment attributes
b06d829 
Implement #180: new attribute partnered reflecting relationship status

Implement #183: new attribute partnered reflecting geographic setting urban vs rural

Implement #181: new attribute control_over_wages

Implement #182: new attribute sexual_autonomy, representing ability to refuse sex

Implement #184: new attribute education_attainment representing the number of years of education completed so far
@pausz
Implement #189: intialise proportion of people who live in an urban b…
5d23ad5 
…ased on data; required to add new parameter.
@pausz
#189: Pass positional arg 'n' to intialize_urban()
5e721f0
@pausz
#189: read urban proportion directly from csv file
ad9991f
@pausz
Write microsim for testing new empwr attributes.
70a52be
@pausz
Load empowerment data and set it as part of the parameter dictionary
7b1e9cb
@pausz
Return urban_prop as a float not pandas series
caf070a
@pausz
Implement #185: intialisation of paid_employment from Kenya DHS data.
d60948c
@pausz
Implement #187 and #188: intialisation of sexual_autonomy and control…
e916de1 
…_over_wages from Kenya DHS data.
@pausz
Implement #186: load partenership data
5bb5fd6
@pausz
Implement #186: initialised whether a woman is partnered or not
ec4fd3c
@pausz
Pass initial distribution of new attributes to People()
6b5a573
@emilydriano
merged main into current branch
ad5e0f9
@emilydriano
added variable to load empowerment data to kenya.py, initial setup of…
0d1175f 
… empowerment data extraction in calibrate_manual script
@emilydriano
added paid_employment emp param to experiment class for calibration t…
5c90296 
…o use, as well as added to calibrate_manual script. Modified calibrate_manual to 4 space indentation formatting.
@emilydriano
merged changes from main
5051a99
@emilydriano
added education as calibration target
100efbf
@emilydriano
merged main into current branch
4b64a31
@emilydriano
updated calibrate_manual to plot paid employment
b051fad
@emilydriano
finished empowerment param plotting in calibrate_manual script
1d99f88
@emilydriano
merged changes in main to local branch
b9422a3
@emilydriano
modified Experiment functions extracting paid work and education to c…
b7751dc 
…alculate model and data averages for 5-year age bins; created calibrate_empowerment script; renamed kenya_tfr.csv to standard naming
@emilydriano
merged changes from main
d07b78b
@emilydriano
reverted incorrect expected num keys expected value
1c4809f
@emilydriano
added plotting functions to calibrate_empowerment.py for paid work an…
72ad6c2 
…d education; corrected logic to include all age bins from min to max age
@emilydriano
fixed employed count in empowerment calibration script
14127bd
@emilydriano
fixed ageparity data reference and changed settings to plot all metri…
7220c50 
…cs, fixed ageparity metric plotting
@emilydriano emilydriano marked this pull request as ready for review May 21, 2024 22:05
MObrien-IDM
MObrien-IDM reviewed May 24, 2024
View reviewed changes
Copy link
Contributor

@MObrien-IDM MObrien-IDM left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! I think you can resolve the conflicts and advance the version accordingly and then I'll approve.

@emilydriano
Copy link
Collaborator Author

LGTM! I think you can resolve the conflicts and advance the version accordingly and then I'll approve.

done!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MObrien-IDM MObrien-IDM MObrien-IDM left review comments

@mzimmermann-IDM mzimmermann-IDM Awaiting requested review from mzimmermann-IDM

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@emilydriano @MObrien-IDM @mzimmermann-IDM @pausz