Merge pull request #1103 from jsiirola/fix-mult-sets

Multiplying sets should not alter the arguments
Pyomo · Aug 15, 2019 · 86e617c · 86e617c
2 parents 2f2a74d + e13452d
commit 86e617c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/examples/pyomo/tutorials/data.out b/examples/pyomo/tutorials/data.out
@@ -13,7 +13,7 @@
         [('A1', 1, 'A1'), ('A1', 1, 'A2'), ('A2', 2, 'A2'), ('A2', 2, 'A3'), ('A3', 3, 'A1'), ('A3', 3, 'A3')]
     E_domain : Dim=0, Dimen=3, Size=27, Domain=None, Ordered=False, Bounds=None
         Virtual
-    E_domain_index_0 : Dim=0, Dimen=2, Size=27, Domain=None, Ordered=False, Bounds=None
+    E_domain_index_0 : Dim=0, Dimen=2, Size=9, Domain=None, Ordered=False, Bounds=None
         Virtual
     F : Dim=1, Dimen=1, Size=9, Domain=None, ArraySize=3, Ordered=False, Bounds=None
         Key : Members

diff --git a/examples/pyomo/tutorials/excel.out b/examples/pyomo/tutorials/excel.out
@@ -13,7 +13,7 @@
         [('A1', 1.0, 'A1'), ('A1', 1.0, 'A2'), ('A2', 2.0, 'A2'), ('A2', 2.0, 'A3'), ('A3', 3.0, 'A1'), ('A3', 3.0, 'A3')]
     E_domain : Dim=0, Dimen=3, Size=27, Domain=None, Ordered=False, Bounds=None
         Virtual
-    E_domain_index_0 : Dim=0, Dimen=2, Size=27, Domain=None, Ordered=False, Bounds=None
+    E_domain_index_0 : Dim=0, Dimen=2, Size=9, Domain=None, Ordered=False, Bounds=None
         Virtual
     F : Dim=1, Dimen=1, Size=0, Domain=None, ArraySize=0, Ordered=False, Bounds=None
         Key : Members

diff --git a/examples/pyomo/tutorials/table.out b/examples/pyomo/tutorials/table.out
@@ -13,7 +13,7 @@
         [('A1', 1, 'A1'), ('A1', 1, 'A2'), ('A2', 2, 'A2'), ('A2', 2, 'A3'), ('A3', 3, 'A1'), ('A3', 3, 'A3')]
     E_domain : Dim=0, Dimen=3, Size=27, Domain=None, Ordered=False, Bounds=None
         Virtual
-    E_domain_index_0 : Dim=0, Dimen=2, Size=27, Domain=None, Ordered=False, Bounds=None
+    E_domain_index_0 : Dim=0, Dimen=2, Size=9, Domain=None, Ordered=False, Bounds=None
         Virtual
     F : Dim=1, Dimen=1, Size=0, Domain=None, ArraySize=0, Ordered=False, Bounds=None
         Key : Members

diff --git a/pyomo/core/base/sets.py b/pyomo/core/base/sets.py
@@ -1544,7 +1544,7 @@ def __init__(self, *args, **kwd):
         _SetOperator.__init__(self, *args, **kwd)
         # the individual index sets definining the product set.
         if isinstance(self._setA,_SetProduct):
-            self.set_tuple = self._setA.set_tuple
+            self.set_tuple = list(self._setA.set_tuple)
         else:
             self.set_tuple = [self._setA]
         if isinstance(self._setB,_SetProduct):