tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[addresses] Sample from higher floors in buildings higher than 10 stories since those are relatively rare and we get enough lower numbered floors from random sampling

Browse Source
This commit is contained in:
Al
2016-07-03 23:41:49 -04:00
parent 47f926c4b6
commit 793671d0b9
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/geodata/addresses/floors.py
View File

@@ -3,7 +3,7 @@ import six
from geodata.addresses.config import address_config from geodata.addresses.config import address_config
from geodata.addresses.numbering import NumberedComponent, Digits, sample_alphabet, latin_alphabet from geodata.addresses.numbering import NumberedComponent, sample_alphabet, latin_alphabet
from geodata.encoding import safe_decode from geodata.encoding import safe_decode
from geodata.math.sampling import weighted_choice, zipfian_distribution, cdf from geodata.math.sampling import weighted_choice, zipfian_distribution, cdf
from geodata.numbers.spellout import numeric_expressions from geodata.numbers.spellout import numeric_expressions
@@ -30,16 +30,23 @@ class Floor(NumberedComponent):
return random.randint(-num_basements, (num_floors - 1) if num_floors > 0 else 0) return random.randint(-num_basements, (num_floors - 1) if num_floors > 0 else 0)
@classmethod @classmethod
def sample_positive_floors(cls, num_floors, zeroth_floor_prob=0.001): def sample_floors_range(cls, min_floor, max_floor):
num_floors = int(num_floors) return random.randint(min_floor, (max_floor - 1) if max_floor > min_floor else min_floor)
if random.random() < zeroth_floor_prob:
return 0
return random.randint(1, (num_floors - 1) if num_floors > 1 else 1)
@classmethod @classmethod
def random_int(cls, language, country=None, num_floors=None, num_basements=None): def random_int(cls, language, country=None, num_floors=None, num_basements=None):
number = None
if num_floors is not None: if num_floors is not None:
number = cls.sample_floors(num_floors, num_basements or 0) try:
num_floors = int(num_floors)
except (ValueError, TypeError):
return weighted_choice(cls.numbered_floors, cls.floor_probs_cdf)
if num_floors <= cls.max_floors:
number = cls.sample_floors(num_floors, num_basements=num_basements or 0)
else:
number = cls.sample_floors_range(cls.max_floors + 1, num_floors)
else: else:
number = weighted_choice(cls.numbered_floors, cls.floor_probs_cdf) number = weighted_choice(cls.numbered_floors, cls.floor_probs_cdf)
@@ -57,8 +64,7 @@ class Floor(NumberedComponent):
number += numbering_starts_at number += numbering_starts_at
if num_type == cls.NUMERIC: if num_type == cls.NUMERIC:
number = safe_decode(number) return safe_decode(number)
return Digits.rewrite(number, language, num_type_props)
elif num_type == cls.ROMAN_NUMERAL: elif num_type == cls.ROMAN_NUMERAL:
roman_numeral = numeric_expressions.roman_numeral(number) roman_numeral = numeric_expressions.roman_numeral(number)
if roman_numeral is not None: if roman_numeral is not None: