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

[fix] address components

Browse Source
This commit is contained in:
Al
2016-05-18 11:58:36 -04:00
parent f5393d24d4
commit bfbe54449a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/geodata/addresses/components.py
View File

@@ -281,15 +281,16 @@ class AddressExpander(object):
prob_dist = component_config prob_dist = component_config
conditionals = component_config.get('conditional') conditionals = component_config.get('conditional', [])
if conditionals: if conditionals:
for c, vals in six.iteritems(conditionals): for vals in conditionals:
c = vals['component']
if c in existing_components: if c in existing_components:
prob_dist = vals['probabilities'] prob_dist = vals['probabilities']
break break
for num_type in (cls.NULL_PHRASE, cls.ALPHANUMERIC_PHRASE, cls.STANDALONE_PHRASE): for num_type in (self.NULL_PHRASE, self.ALPHANUMERIC_PHRASE, self.STANDALONE_PHRASE):
key = '{}_probability'.format(num_type) key = '{}_probability'.format(num_type)
prob = alphanumeric_props.get(key) prob = alphanumeric_props.get(key)
if prob is not None: if prob is not None:
@@ -299,7 +300,7 @@ class AddressExpander(object):
probs = cdf(probs) probs = cdf(probs)
num_type = weighted_choice(values, probs) num_type = weighted_choice(values, probs)
if num_type == cls.NULL_PHRASE: if num_type == self.NULL_PHRASE:
return None return None
else: else:
return num_type return num_type