bugfix for direction rules

gidden · Sep 6, 2017 · 58649e0 · 58649e0
1 parent 10371ee
commit 58649e0
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/salamanca/models/project.py b/salamanca/models/project.py
@@ -307,20 +307,16 @@ def construct(self, diffusion={}, direction={}):
                 rule=lambda m, idx: theil_diff_lo_rule(m, idx, b),
                 doc='income share within 20% from past',
             )
-        b = direction.pop('income', False)
-        if b:
-            b = 0.2 if b is True else b
+        if direction.pop('income', False):
             m.i_dir = mo.Constraint(
                 m.idxs,
-                rule=lambda m: income_direction_rule(m, b),
+                rule=income_direction_rule,
                 doc='income must track with national values',
             )
-        b = direction.pop('theil', False)
-        if b:
-            b = 0.2 if b is True else b
+        if direction.pop('theil', False):
             m.t_dir = mo.Constraint(
                 m.idxs,
-                rule=lambda m: theil_direction_rule(m, b),
+                rule=theil_direction_rule,
                 doc='theil must track with national values',
             )
         # Objective