Merge pull request #3567 from jsiirola/fbbt-numpy

FBBT: resolve bug registering native type handlers

Author: jsiirola

pyomo/contrib/fbbt/fbbt.py

@@ -1105,7 +1105,9 @@ def _before_external_function(visitor, child):
 def _register_new_before_child_handler(visitor, child):
     handlers = _before_child_handlers
     child_type = child.__class__
-    if child.is_variable_type():
+    if child_type in native_types:
+        handlers[child_type] = _before_constant
+    elif child.is_variable_type():
         handlers[child_type] = _before_var
     elif not child.is_potentially_variable():
         handlers[child_type] = _before_NPV

pyomo/contrib/fbbt/tests/test_fbbt.py

@@ -11,7 +11,7 @@
 
 import pyomo.common.unittest as unittest
 import pyomo.environ as pyo
-from pyomo.contrib.fbbt.fbbt import fbbt, compute_bounds_on_expr
+from pyomo.contrib.fbbt.fbbt import fbbt, compute_bounds_on_expr, _before_child_handlers
 from pyomo.common.dependencies import numpy as np, numpy_available
 from pyomo.common.fileutils import find_library
 from pyomo.common.log import LoggingIntercept
@@ -1363,3 +1363,30 @@ def test_ranged_expression(self):
         self.assertEqual(m.l.bounds, (2, 7))
         self.assertEqual(m.x.bounds, (3, 7))
         self.assertEqual(m.u.bounds, (3, 8))
+
+    @unittest.skipUnless(numpy_available, "Test requires numpy")
+    def test_numpy_leaves(self):
+        m = pyo.ConcreteModel()
+        m.l = pyo.Var(bounds=(2, None))
+        m.x = pyo.Var()
+        m.u = pyo.Var(bounds=(None, 8))
+        m.c = pyo.Constraint(
+            expr=pyo.inequality(m.l + np.int32(1), m.x, m.u - np.float64(1))
+        )
+
+        # Remove the numpy types so we can test that automatic numeric
+        # type registrations
+        old = [(t, _before_child_handlers.pop(t, None)) for t in (np.int32, np.float64)]
+
+        try:
+            self.tightener(m)
+            self.tightener(m)
+            self.assertEqual(m.l.bounds, (2, 6.0))
+            self.assertEqual(m.x.bounds, (3, 7.0))
+            self.assertEqual(m.u.bounds, (4, 8.0))
+        finally:
+            for t, fcn in old:
+                if fcn is None:
+                    _before_child_handlers.pop(t, None)
+                else:
+                    _before_child_handlers[t] = fcn