From b727078be5d563341d3ee6b7589efd2aacf129de Mon Sep 17 00:00:00 2001 From: Al Date: Sun, 31 Jul 2016 20:39:15 -0400 Subject: [PATCH] [fix] use alphanumeric in generated component configs by default --- scripts/geodata/addresses/components.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/geodata/addresses/components.py b/scripts/geodata/addresses/components.py index ecf61496..e775ce21 100644 --- a/scripts/geodata/addresses/components.py +++ b/scripts/geodata/addresses/components.py @@ -463,12 +463,19 @@ class AddressComponents(object): values = [] probs = [] - for num_type in (self.NULL_PHRASE, self.ALPHANUMERIC_PHRASE, self.STANDALONE_PHRASE): + for num_type in (self.ALPHANUMERIC_PHRASE, self.NULL_PHRASE, self.STANDALONE_PHRASE): key = '{}_probability'.format(num_type) prob = prob_dist.get(key) if prob is not None: values.append(num_type) probs.append(prob) + elif num_type in prob_dist: + values.append(num_type) + probs.append(1.0) + break + + if not probs: + return None probs = cdf(probs) num_type = weighted_choice(values, probs)