FIX: revert part of commit 6e0baca to avoid regression with duplicate names (closes #247)

Author: gdementen

larray_editor/api.py

@@ -213,9 +213,7 @@ def get_name(i, obj, depth=0):
         args = [la.Session(a) if not isinstance(a, la.Session) else a
                 for a in args]
 
-    data = dict(zip(names, args))
-
-    if dlg.setup_and_check(data, title=title, caller_info=caller_info, **kwargs):
+    if dlg.setup_and_check(args, names=names, title=title, caller_info=caller_info, **kwargs):
         return dlg
     else:
         return None

larray_editor/comparator.py

@@ -183,8 +183,8 @@ def _setup_and_check(self, widget, data, title, readonly, **kwargs):
         ----------
         widget: QWidget
             Parent widget.
-        data: dict of Array
-            Arrays to compare as a {name: Array} dict.
+        data: list or tuple of Array or ndarray
+            Arrays to compare.
         title: str
             Title.
         readonly: bool
@@ -195,21 +195,16 @@ def _setup_and_check(self, widget, data, title, readonly, **kwargs):
           * atol: int or float
           * nans_equal: bool
           * bg_gradient: str
+          * names: list of str
         """
-        if isinstance(data, (list, tuple)):
-            names = kwargs.pop('names', [f"Array{i}" for i in range(len(data))])
-            data = dict(zip(names, data))
-            warnings.warn("For ArrayComparator.setup_and_check, using a list or tuple for the data argument, "
-                          "and using the names argument are both deprecated. Please use a dict instead",
-                          FutureWarning, stacklevel=3)
-
-        assert all(isinstance(s, la.Array) for s in data.values())
+        arrays = [la.asarray(array) for array in data if isinstance(array, DISPLAY_IN_GRID)]
+        names = kwargs.pop('names', [f"Array{i}" for i in range(len(arrays))])
 
         layout = QVBoxLayout()
         widget.setLayout(layout)
 
         comparator_widget = ComparatorWidget(self, **kwargs)
-        comparator_widget.set_data(data.values(), la.Axis(data.keys(), 'array'))
+        comparator_widget.set_data(arrays, la.Axis(names, 'array'))
         layout.addWidget(comparator_widget)
 
 
@@ -234,8 +229,8 @@ def _setup_and_check(self, widget, data, title, readonly, **kwargs):
         ----------
         widget: QWidget
             Parent widget.
-        data: dict of Session
-            Sessions to compare as a {name: Session} dict.
+        data: list or tuple of Session
+            Sessions to compare.
         title: str
             Title.
         readonly: bool
@@ -246,17 +241,14 @@ def _setup_and_check(self, widget, data, title, readonly, **kwargs):
           * atol: int or float
           * nans_equal: bool
           * bg_gradient: str
+          * names: list of str
         """
-        if isinstance(data, (list, tuple)):
-            names = kwargs.pop('names', [f"Session{i}" for i in range(len(data))])
-            data = dict(zip(names, data))
-            warnings.warn("For SessionComparator.setup_and_check, using a list or tuple for the data argument, "
-                          "and using the names argument are both deprecated. Please use a dict instead",
-                          FutureWarning, stacklevel=3)
-
-        assert all(isinstance(s, la.Session) for s in data.values())
-        self.sessions = data.values()
-        self.stack_axis = la.Axis(data.keys(), 'session')
+        sessions = data
+        names = kwargs.pop('names', [f"Session{i}" for i in range(len(sessions))])
+
+        assert all(isinstance(s, la.Session) for s in sessions)
+        self.sessions = sessions
+        self.stack_axis = la.Axis(names, 'session')
 
         layout = QVBoxLayout()
         widget.setLayout(layout)

larray_editor/tests/test_api_larray.py

@@ -144,13 +144,16 @@ def make_demo(width=20, ball_radius=5, path_radius=5, steps=30):
 
 # edit(arr2)
 
+# test issue #247 (same names)
+# compare(arr3, arr3)
 # compare(arr3, arr3 + 1.0)
 # compare(arr3, arr3 + 1.0, names=['arr3', 'arr3 + 1.0'])
 # compare(np.random.normal(0, 1, size=(10, 2)), np.random.normal(0, 1, size=(10, 2)))
+
 # sess1 = la.Session(arr4=arr4, arr3=arr3, data=data3)
 # sess1.save('sess1.h5')
 # sess2 = la.Session(arr4=arr4 + 1.0, arr3=arr3 * 2.0, data=data3 * 1.05)
-# compare('sess1.h5', sess2)
+# compare('sess1.h5', sess2)   # sess1.h5/data is nan because np arrays are not saved to H5
 # compare(Path('sess1.h5'), sess2)
 # compare(la.Session(arr2=arr2, arr3=arr3),
 #         la.Session(arr2=arr2 + 1.0, arr3=arr3 * 2.0))
@@ -176,14 +179,18 @@ def make_demo(width=20, ball_radius=5, path_radius=5, steps=30):
 # compare(arr1, arr2, rtol=0.3)
 #
 # arr2 = la.where(arr2 > 1, arr1, -arr1)
+# arr1_m = arr1['M'].copy()
 # arr1['M'] = la.nan
+# compare(arr1, arr2, nans_equal=False, title='with nans on left side')
 # arr2['M'] = la.nan
-# compare(arr1, arr2, nans_equal=False)
+# compare(arr1, arr2, nans_equal=False, title='with nans on both sides')
+# arr1['M'] = arr1_m
+# compare(arr1, arr2, nans_equal=False, title='with nans on right side')
 #
 # arr1 = la.ndtest((3, 3))
 # arr2 = 2 * arr1
 # arr3 = la.where(arr1 % 2 == 0, arr1, -arr1)
-# compare(arr1, arr2, arr3, bg_gradient='blue-red')
+# compare(arr1, arr2, arr3, bg_gradient='blue-white-red')
 
 # test for arr.plot(show=True) which is the default
 # =================================================