From c1369b5fd6088ac9400b8f5c99e34df415e1d015 Mon Sep 17 00:00:00 2001 From: John Siirola Date: Fri, 26 May 2023 12:23:42 -0600 Subject: [PATCH 1/2] Fix backwards incompatible API change introduced by #2829 --- pyomo/core/base/indexed_component_slice.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyomo/core/base/indexed_component_slice.py b/pyomo/core/base/indexed_component_slice.py index 575037ace4c..9779711a19b 100644 --- a/pyomo/core/base/indexed_component_slice.py +++ b/pyomo/core/base/indexed_component_slice.py @@ -338,15 +338,15 @@ def index_wildcard_keys(self, sort): _iter = _IndexedComponent_slice_iter(self, iter_over_index=True, sort=sort) return (_iter.get_last_index_wildcards() for _ in _iter) - def wildcard_keys(self, sort): + def wildcard_keys(self, sort=SortComponents.UNSORTED): _iter = _IndexedComponent_slice_iter(self, sort=sort) return (_iter.get_last_index_wildcards() for _ in _iter) - def wildcard_values(self, sort): + def wildcard_values(self, sort=SortComponents.UNSORTED): """Return an iterator over this slice""" return _IndexedComponent_slice_iter(self, sort=sort) - def wildcard_items(self, sort): + def wildcard_items(self, sort=SortComponents.UNSORTED): _iter = _IndexedComponent_slice_iter(self, sort=sort) return ((_iter.get_last_index_wildcards(), _) for _ in _iter) From 9c3aefef785027b047eb89a1f82d2a34cd47d3cd Mon Sep 17 00:00:00 2001 From: John Siirola Date: Fri, 26 May 2023 12:27:24 -0600 Subject: [PATCH 2/2] revert change to tests to exercise old wildcard API --- pyomo/core/tests/unit/test_indexed_slice.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyomo/core/tests/unit/test_indexed_slice.py b/pyomo/core/tests/unit/test_indexed_slice.py index aae1f673f6e..e89c48a6061 100644 --- a/pyomo/core/tests/unit/test_indexed_slice.py +++ b/pyomo/core/tests/unit/test_indexed_slice.py @@ -492,9 +492,9 @@ def test_iterators(self): m = self.m _slice = self.m.x[...] - self.assertEqual(list(_slice.wildcard_keys(False)), [7, 8, 9]) + self.assertEqual(list(_slice.wildcard_keys()), [7, 8, 9]) self.assertEqual( - list(_slice.wildcard_items(False)), [(7, m.x[7]), (8, m.x[8]), (9, m.x[9])] + list(_slice.wildcard_items()), [(7, m.x[7]), (8, m.x[8]), (9, m.x[9])] ) self.assertEqual(list(_slice.expanded_keys()), [7, 8, 9]) self.assertEqual( @@ -503,11 +503,11 @@ def test_iterators(self): _slice = self.m.b[...] self.assertEqual( - list(_slice.wildcard_keys(False)), + list(_slice.wildcard_keys()), [(1, 4), (1, 5), (1, 6), (2, 4), (2, 5), (2, 6), (3, 4), (3, 5), (3, 6)], ) self.assertEqual( - list(_slice.wildcard_items(False)), + list(_slice.wildcard_items()), [ ((1, 4), m.b[1, 4]), ((1, 5), m.b[1, 5]),