more fixes to coding age

pycrossva/resources/mapping_configuration_files/2016WHOv151_to_InterVA5.csv

@@ -17,17 +17,18 @@ i022e, Was s(he) aged 1 to 4 years at death? 1 to 4 (child),age_child_years,[Ent
 i022e, Was s(he) aged 1 to 4 years at death? 1 to 4 (child),ageInYears,Calculated field: int(${ageInDays} div 365.25),between,1 to 4,,
 i022f, Was s(he) aged 1 to 11 months at death? 1-11 months (child or neonate?),age_child_years,[Enter child's age in months:],lt,1,,
 i022f, Was s(he) aged 1 to 11 months at death? 1-11 months (child or neonate?),age_child_months,[Enter child's age in months:],between,1 to 11,,
-i022f, Was s(he) aged 1 to 11 months at death? 1-11 months (child or neonate?),ageInDays,Calculated field: int(${ageInYearsRemain} div 30.4),between,28 to 365,,
-i022g, Was s(he) aged < 1 month (28 days) at death? 0 - 27 days (neonate),ageInDays,"(${Id10023} - ${Id10021})",le,28,,
-i022g, Was s(he) aged < 1 month (28 days) at death? 0 - 27 days (neonate),ageInDaysNeonate,"Calculated field: if(${ageInDays} = 'NaN' or string-length(${ageInDays}) = 0, ${age_neonate_days}, ${ageInDays})",le,28,,
+i022f, Was s(he) aged 1 to 11 months at death? 1-11 months (child or neonate?),age_child_days,[Enter child's age in days:],between,28 to 364,,
+i022f, Was s(he) aged 1 to 11 months at death? 1-11 months (child or neonate?),ageInDays,Calculated field: int(${ageInYearsRemain} div 30.4),between,28 to 364,,
+i022g, Was s(he) aged < 1 month (28 days) at death? 0 - 27 days (neonate),ageInDays,"(${Id10023} - ${Id10021})",lt,28,,
+i022g, Was s(he) aged < 1 month (28 days) at death? 0 - 27 days (neonate),ageInDaysNeonate,"Calculated field: if(${ageInDays} = 'NaN' or string-length(${ageInDays}) = 0, ${age_neonate_days}, ${ageInDays})",lt,28,,
 i022h, Was s(he) a live baby who died within 24 hours of birth? day0 iv5Names[12],ageInDays,"(${Id10023} - ${Id10021})",lt,1,,
 i022h, Was s(he) a live baby who died within 24 hours of birth? day0 iv5Names[12],ageInDaysNeonate,"Calculated field: if(${ageInDays} = 'NaN' or string-length(${ageInDays}) = 0, ${age_neonate_days}, ${ageInDays})",lt,1,,
-i022i, Was s(he) a baby who died between 24 and 48 hours of birth? day1 iv5Names[13],ageInDays,"(${Id10023} - ${Id10021})",between,1 to 2,,
-i022i, Was s(he) a baby who died between 24 and 48 hours of birth? day1 iv5Names[13],ageInDaysNeonate,"Calculated field: if(${ageInDays} = 'NaN' or string-length(${ageInDays}) = 0, ${age_neonate_days}, ${ageInDays})",between,1 to 2,,
-i022j," Was s(he) a baby who died more than 48 hours from birth, but within the first week? day2-6 iv5Names[14]",ageInDays,"(${Id10023} - ${Id10021})",between,3 to 6,,
-i022j," Was s(he) a baby who died more than 48 hours from birth, but within the first week? day2-6 iv5Names[14]",ageInDaysNeonate,"Calculated field: if(${ageInDays} = 'NaN' or string-length(${ageInDays}) = 0, ${age_neonate_days}, ${ageInDays})",between,3 to 6,,
-i022k," Was s(he) a baby who died after the first week, but within the first month? wk2-4 iv5Names[15]",ageInDays,"(${Id10023} - ${Id10021})",between,7 to 28,,
-i022k," Was s(he) a baby who died after the first week, but within the first month? wk2-4 iv5Names[15]",ageInDaysNeonate,"Calculated field: if(${ageInDays} = 'NaN' or string-length(${ageInDays}) = 0, ${age_neonate_days}, ${ageInDays})",between,7 to 28,,
+i022i, Was s(he) a baby who died between 24 and 48 hours of birth? day1 iv5Names[13],ageInDays,"(${Id10023} - ${Id10021})",eq,1,,
+i022i, Was s(he) a baby who died between 24 and 48 hours of birth? day1 iv5Names[13],ageInDaysNeonate,"Calculated field: if(${ageInDays} = 'NaN' or string-length(${ageInDays}) = 0, ${age_neonate_days}, ${ageInDays})",eq,1,,
+i022j," Was s(he) a baby who died more than 48 hours from birth, but within the first week? day2-6 iv5Names[14]",ageInDays,"(${Id10023} - ${Id10021})",between,2 to 6,,
+i022j," Was s(he) a baby who died more than 48 hours from birth, but within the first week? day2-6 iv5Names[14]",ageInDaysNeonate,"Calculated field: if(${ageInDays} = 'NaN' or string-length(${ageInDays}) = 0, ${age_neonate_days}, ${ageInDays})",between,2 to 6,,
+i022k," Was s(he) a baby who died after the first week, but within the first month? wk2-4 iv5Names[15]",ageInDays,"(${Id10023} - ${Id10021})",between,7 to 27,,
+i022k," Was s(he) a baby who died after the first week, but within the first month? wk2-4 iv5Names[15]",ageInDaysNeonate,"Calculated field: if(${ageInDays} = 'NaN' or string-length(${ageInDays}) = 0, ${age_neonate_days}, ${ageInDays})",between,7 to 27,,
 i022l, Was she a woman aged 12-19 years at death? f-19,ageInYears,Calculated field: int(${ageInDays} div 365.25),between,12 to 19,i019b,
 i022l, Was she a woman aged 12-19 years at death? f-19,age_adult,Calculated field: int(${ageInDays} div 365.25),between,12 to 19,i019b,
 i022m, Was she a woman aged 57-34 years at death? f20-34,ageInYears,Calculated field: int(${ageInDays} div 365.25),between,20 to 34,i019b,

setup.py

@@ -4,7 +4,7 @@
 here = os.path.abspath(os.path.dirname(__file__))
 
 setup(name='pycrossva',
-      version='0.91',
+      version='0.92',
       description='prepare data from WHO and PHRMC instruments for verbal autopsy algorithms',
       url='https://github.com/verbal-autopsy-software/pyCrossVA',
       license='GNU General Public License v3.0',