Update type registration tests to reflect automatic numpy callback

Author: jsiirola

pyomo/core/tests/unit/test_numvalue.py

@@ -50,7 +50,16 @@ def __init__(self, val=0):
 
 class MyBogusNumericType(MyBogusType):
     def __add__(self, other):
-        return MyBogusNumericType(self.val + float(other))
+        if other.__class__ in native_numeric_types:
+            return MyBogusNumericType(self.val + float(other))
+        else:
+            return NotImplemented
+
+    def __le__(self, other):
+        if other.__class__ in native_numeric_types:
+            return self.val <= float(other)
+        else:
+            return NotImplemented
 
     def __lt__(self, other):
         return self.val < float(other)
@@ -534,6 +543,8 @@ def test_unknownNumericType(self):
         try:
             val = as_numeric(ref)
             self.assertEqual(val().val, 42.0)
+            self.assertIn(MyBogusNumericType, native_numeric_types)
+            self.assertIn(MyBogusNumericType, native_types)
         finally:
             native_numeric_types.remove(MyBogusNumericType)
             native_types.remove(MyBogusNumericType)
@@ -562,10 +573,43 @@ def test_numpy_basic_bool_registration(self):
     @unittest.skipUnless(numpy_available, "This test requires NumPy")
     def test_automatic_numpy_registration(self):
         cmd = (
-            'import pyomo; from pyomo.core.base import Var, Param; '
-            'from pyomo.core.base.units_container import units; import numpy as np; '
-            'print(np.float64 in pyomo.common.numeric_types.native_numeric_types); '
-            '%s; print(np.float64 in pyomo.common.numeric_types.native_numeric_types)'
+            'from pyomo.common.numeric_types import native_numeric_types as nnt; '
+            'print("float64" in [_.__name__ for _ in nnt]); '
+            'import numpy; '
+            'print("float64" in [_.__name__ for _ in nnt])'
+        )
+
+        rc = subprocess.run(
+            [sys.executable, '-c', cmd],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            text=True,
+        )
+        self.assertEqual((rc.returncode, rc.stdout), (0, "False\nTrue\n"))
+
+        cmd = (
+            'import numpy; '
+            'from pyomo.common.numeric_types import native_numeric_types as nnt; '
+            'print("float64" in [_.__name__ for _ in nnt])'
+        )
+
+        rc = subprocess.run(
+            [sys.executable, '-c', cmd],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            text=True,
+        )
+        self.assertEqual((rc.returncode, rc.stdout), (0, "True\n"))
+
+    def test_unknownNumericType_expr_registration(self):
+        cmd = (
+            'import pyomo; '
+            'from pyomo.core.base import Var, Param; '
+            'from pyomo.core.base.units_container import units; '
+            'from pyomo.common.numeric_types import native_numeric_types as nnt; '
+            f'from {__name__} import MyBogusNumericType; '
+            'ref = MyBogusNumericType(42); '
+            'print(MyBogusNumericType in nnt); %s; print(MyBogusNumericType in nnt); '
         )
 
         def _tester(expr):
@@ -575,19 +619,29 @@ def _tester(expr):
                 stderr=subprocess.STDOUT,
                 text=True,
             )
-            self.assertEqual((rc.returncode, rc.stdout), (0, "False\nTrue\n"))
-
-        _tester('Var() <= np.float64(5)')
-        _tester('np.float64(5) <= Var()')
-        _tester('np.float64(5) + Var()')
-        _tester('Var() + np.float64(5)')
-        _tester('v = Var(); v.construct(); v.value = np.float64(5)')
-        _tester('p = Param(mutable=True); p.construct(); p.value = np.float64(5)')
-        _tester('v = Var(units=units.m); v.construct(); v.value = np.float64(5)')
-        _tester(
-            'p = Param(mutable=True, units=units.m); p.construct(); '
-            'p.value = np.float64(5)'
-        )
+            self.assertEqual(
+                (rc.returncode, rc.stdout),
+                (
+                    0,
+                    '''False
+WARNING: Dynamically registering the following numeric type:
+        pyomo.core.tests.unit.test_numvalue.MyBogusNumericType
+    Dynamic registration is supported for convenience, but there are known
+    limitations to this approach.  We recommend explicitly registering numeric
+    types using RegisterNumericType() or RegisterIntegerType().
+True
+''',
+                ),
+            )
+
+        _tester('Var() <= ref')
+        _tester('ref <= Var()')
+        _tester('ref + Var()')
+        _tester('Var() + ref')
+        _tester('v = Var(); v.construct(); v.value = ref')
+        _tester('p = Param(mutable=True); p.construct(); p.value = ref')
+        _tester('v = Var(units=units.m); v.construct(); v.value = ref')
+        _tester('p = Param(mutable=True, units=units.m); p.construct(); p.value = ref')
 
 
 if __name__ == "__main__":