From 7648aec9e0c7d8755d74f5e9f45cb91992482e09 Mon Sep 17 00:00:00 2001 From: Bethany Nicholson Date: Mon, 6 Jan 2020 17:44:06 -0700 Subject: [PATCH] When creating References check for equivalent sets instead of identical set objects --- pyomo/core/base/reference.py | 2 +- pyomo/core/tests/unit/test_reference.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyomo/core/base/reference.py b/pyomo/core/base/reference.py index d63011b27f3..35fec486400 100644 --- a/pyomo/core/base/reference.py +++ b/pyomo/core/base/reference.py @@ -410,7 +410,7 @@ def _identify_wildcard_sets(iter_stack, index): if len(index[i]) != len(level): return None # if any subset differs - if any(index[i].get(j,None) is not _set for j,_set in iteritems(level)): + if any(index[i].get(j,None) != _set for j,_set in iteritems(level)): return None return index diff --git a/pyomo/core/tests/unit/test_reference.py b/pyomo/core/tests/unit/test_reference.py index 39f9c69fbb9..d46497ad0a5 100644 --- a/pyomo/core/tests/unit/test_reference.py +++ b/pyomo/core/tests/unit/test_reference.py @@ -540,7 +540,7 @@ def b(b,i): m.r = Reference(m.b[:].x[:]) self.assertIs(m.r.type(), Var) - self.assertIs(type(m.r.index_set()), SetOf) + self.assertIs(type(m.r.index_set()), _SetProduct) self.assertEqual(len(m.r), 2*2) self.assertEqual(m.r[1,3].lb, 1) self.assertEqual(m.r[2,4].lb, 2)