Added household data for districts with no information

exposurejapan/constants.py

@@ -17,7 +17,7 @@
 # along with this program. If not, see http://www.gnu.org/licenses/.
 
 
-# Constant numbers for building attributes in BuildingNumber and DwellingNumber
+# Constant numbers for building attribute columns in BuildingNumber and DwellingNumber
 # tables in the JapanDatabase
 DISTRICT_ID = 0
 BUILDING_TYPE_ID = 1
@@ -26,7 +26,7 @@ STORY_NUMBER_ID = 3
 NUMBER_DWELLING = 4
 NUMBER_BUILDING = 4
 
-# Constant numbers for building attributes in HouseholdData table
+# Constant numbers for building attribute columns in HouseholdData table
 DWELLING_TYPE_ID = 3
 TENURE_TYPE_ID = 4
 NUMBER_HOUSEHOLD = 6
@@ -37,17 +37,18 @@ FLOORSPACE_PER_DWELLING = 10
 TATAMI_PER_PERSON = 11
 PERSON_PER_ROOM = 12
 
-# Constant numbers for PopulationDistribution table
+# Constant numbers for columns in PopulationDistribution table
 TOTAL_POPULATION = 1
 POPULATION_DENSITY = 2
 MALE_POPULATION = 2
 FEMALE_POPULATION = 3
 NUMBER_HOUSEHOLD_POPULATION = 4
 
-# Constant for calculating proportion for wood and non wood in household data
+# Constant for number of dwelling attribute for calculating proportion of wooden and
+# non-wooden household data
 NUMBER_DWELLING_HOUSEHOLD_PROPORTIONS = 3
 
-# Constant for number of dwelling in HouseholdData table
+# Constant for number of dwelling column in HouseholdData table
 NUMBER_DWELLING_HOUSEHOLD = 5
 
 # Constant numbers for construction material types
@@ -60,39 +61,44 @@ NON_WOODEN = 4
 # Constant numbers for building types
 OTHER = 4
 
-# Constant numbers for extracting number of dwellings or number of buildings from
+# Constant for extracting number of dwellings or number of buildings column from
 # JapanDatabase
 NUMBER_DWELLING_OR_NUMBER_BUILDING = 4
 
-# Constant number for extracting number of dwelling or number of buildings from the frequency
-# distribution calculations
+# Constant for extracting number of dwelling or number of buildings attribute from the
+# frequency-distribution calculations
 NUMBER_DWELLING_OR_NUMBER_BUILDING_FREQUENCY_DISTRIBUTION = 5
 
-# Constant number for extracting number of households and household members from the frequency
-# distribution calculations
+# Constants for extracting number of households and household members attributes from the
+# frequency-distribution calculations
 NUMBER_HOUSEHOLD_OR_HOUSEHOLD_MEMBER_FREQUENCY_DISTRIBUTION = 13
 NUMBER_HOUSEHOLD_FREQUENCY_DISTRIBUTION = 13
 NUMBER_HOUSEHOLD_MEMBER_FREQUENCY_DISTRIBUTION = 14
 
-# Constant number for districts table
+# Constant number for column in districts table
 ADMINISTRATIVE_UNIT_AREA = 2
 
-# Constant numbers for population density in the BuildingNumber list
+# Constant numbers for building exposure attributes while calculating
+# building numbers for administrative units with no information
 POPULATION_DENSITY_BUILDING_NUMBER = 6
 BUILDING_DENSITY = 5
-
-# Constant number for extracting building attributes while calculating
-# building numbers for administrative units with no information
 NUMBER_BUILDING_INFO = 5
 BUILDING_TYPE_ID_NO_INFO = 3
 CONSTRUCTION_MATERIAL_ID_NO_INFO = 4
 STORY_NUMBER_ID_NO_INFO = 5
 NUMBER_BUILDING_NO_INFO = 6
 
-# Constant for calculating dwelling numbers in administrative units with no information
+# Constant numbers for building exposure attributes while calculating
+# dwelling numbers for administrative units with no  information
 DWELLING_DENSITY = 5
 BUILDING_DENSITY_DWELLING_NUMBER = 6
 
-# Constant for Japanese and European Geodetic CRS
+# Constant numbers for Japanese and European Geodetic CRS
 JGD2000 = 4612
 WGS84 = 4326
+
+# Constant numbers for building exposure attributes while calculating
+# household data in administrative units with no information
+DWELLING_DENSITY_HOUSEHOLD = 15
+HOUSEHOLD_NUMBER_DENSITY = 13
+HOUSEHOLD_MEMBER_DENSITY = 14