Merge branch 'main' into linear-dual-fix

Author: mrmundt

pyomo/opt/results/container.py

@@ -80,7 +80,7 @@ def __init__(
         self._active = False
 
     def __eq__(self, other):
-        return self.__dict__ == other.__dict__
+        return self.__dict__ == getattr(other, '__dict__', None)
 
     def get_value(self):
         if isinstance(self.value, enum.Enum):
@@ -191,7 +191,7 @@ def __getitem__(self, i):
         return self._list[i]
 
     def __eq__(self, other):
-        return self.__dict__ == other.__dict__
+        return self.__dict__ == getattr(other, '__dict__', None)
 
     def clear(self):
         self._list = []
@@ -279,7 +279,12 @@ def __eq__(self, other):
         # underlying dict data (which doesn't show up in the __dict__).
         # So we will use the base __eq__ in addition to checking
         # __dict__.
-        return super().__eq__(other) and self.__dict__ == other.__dict__
+        #
+        # Note: __eq__ can return True, False, or NotImplemented
+        base = super().__eq__(other)
+        if base == True:
+            return self.__dict__ == getattr(other, '__dict__', None)
+        return base
 
     def __getattr__(self, name):
         try:

pyomo/opt/tests/base/test_soln.py

@@ -615,6 +615,34 @@ def test_pickle(self):
         self.assertIs(d.b, e.b)
         self.assertEqual(d.c, e.c)
 
+    def test_eq(self):
+        d = container.MapContainer()
+        d.declare('x', value=1)
+        d.declare('y', value='a')
+        d.declare('z', value=container.ListContainer(container.MapContainer))
+        self.assertFalse(d == container.MapContainer())
+        self.assertFalse(d == "Something else")
+
+        e = container.ListContainer(container.UndefinedData)
+        self.assertFalse(d == e)
+
+        dd = container.MapContainer()
+        dd.declare('x', value=1)
+        dd.declare('y', value=1)
+        dd.declare('z', value=container.ListContainer(container.UndefinedData))
+        self.assertFalse(d == dd)
+        d.y = 'b'
+        dd.y = 'b'
+        dd.declare('z', value=container.ListContainer(container.MapContainer))
+        self.assertTrue(d == dd)
+
+        d.z.add()
+        d.z[0].declare('a', value=0)
+        self.assertFalse(d == dd)
+        dd.z.add()
+        dd.z[0].declare('a', value=0)
+        self.assertTrue(d == dd)
+
 
 if __name__ == "__main__":
     unittest.main()