update model1 to use threshold

gidden · Sep 11, 2017 · 75108e6 · 75108e6
1 parent eaa6062
commit 75108e6
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/salamanca/models/project.py b/salamanca/models/project.py
@@ -453,10 +453,13 @@ def construct(self, diffusion={}, direction={}, spread={}, threshold=1.0):
         )
         m = self.model
         # Constraints specific to this model
-        m.cdf_lo = mo.Constraint(rule=threshold_lo_rule,
-                                 doc='Population under threshold within 5%')
-        m.cdf_hi = mo.Constraint(rule=threshold_hi_rule,
-                                 doc='Population under threshold within 5%')
+
+        m.cdf_lo = mo.Constraint(
+            rule=lambda m: threshold_lo_rule(m, f=threshold),
+            doc='Population under threshold within 5%')
+        m.cdf_hi = mo.Constraint(
+            rule=lambda m: threshold_hi_rule(m, f=threshold),
+            doc='Population under threshold within 5%')
         # Objective
         m.obj = mo.Objective(rule=theil_total_sum_obj, sense=mo.minimize)
         return self