Merge pull request #3392 from jsiirola/xpress-9.5

Update Xpress interfaces to support 9.5

Author: jsiirola

pyomo/common/collections/component_map.py

@@ -47,6 +47,18 @@ def _unhashable(val):
     def _tuple(self, val):
         return tuple(self[i.__class__](i) for i in val)
 
+    def hashable(self, obj, hashable=None):
+        if isinstance(obj, type):
+            cls = obj
+        else:
+            cls = type(obj)
+        if hashable is None:
+            fcn = self.get(cls, None)
+            if fcn is None:
+                raise KeyError(obj)
+            return fcn is self._hashable
+        self[cls] = self._hashable if hashable else self._unhashable
+
 
 _hasher = _Hasher()
 
@@ -78,6 +90,8 @@ class ComponentMap(AutoSlots.Mixin, collections.abc.MutableMapping):
 
     __slots__ = ("_dict",)
     __autoslot_mappers__ = {'_dict': _rehash_keys}
+    # Expose a "public" interface to the global _hasher dict
+    hasher = _hasher
 
     def __init__(self, *args, **kwds):
         # maps id_hash(obj) -> (obj,val)

pyomo/common/collections/component_set.py

@@ -61,6 +61,8 @@ class ComponentSet(AutoSlots.Mixin, collections_MutableSet):
 
     __slots__ = ("_data",)
     __autoslot_mappers__ = {'_data': _rehash_keys}
+    # Expose a "public" interface to the global _hasher dict
+    hasher = _hasher
 
     def __init__(self, iterable=None):
         # maps id_hash(obj) -> obj

pyomo/common/tests/test_component_map.py

@@ -49,6 +49,27 @@ def test_tuple(self):
         self.assertIn((1, (2, m.v)), m.cm)
         self.assertNotIn((1, (2, m.v)), i.cm)
 
+    def test_hasher(self):
+        m = ComponentMap()
+        a = 'str'
+        m[a] = 5
+        self.assertTrue(m.hasher.hashable(a))
+        self.assertTrue(m.hasher.hashable(str))
+        self.assertEqual(m._dict, {a: (a, 5)})
+        del m[a]
+
+        m.hasher.hashable(a, False)
+        m[a] = 5
+        self.assertFalse(m.hasher.hashable(a))
+        self.assertFalse(m.hasher.hashable(str))
+        self.assertEqual(m._dict, {id(a): (a, 5)})
+
+        class TMP:
+            pass
+
+        with self.assertRaises(KeyError):
+            m.hasher.hashable(TMP)
+
 
 class TestDefaultComponentMap(unittest.TestCase):
     def test_default_component_map(self):