Make IDViews respect order (#482)

* make views respect order * Fix diviews * fix issue * improved tests
xgi-org · Oct 26, 2023 · 5e194bc · 5e194bc
1 parent 84187d6
commit 5e194bc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/tests/core/test_diviews.py b/tests/core/test_diviews.py
@@ -191,13 +191,15 @@ def test_view_len(diedgelist2):
 
 def test_bunch_view(diedgelist2):
     H = xgi.DiHypergraph(diedgelist2)
-    bunch_view = H.edges.from_view(H.edges, bunch=[1, 2])
+    bunch_view = H.edges.from_view(H.edges, bunch=[2, 1])
     assert len(bunch_view) == 2
     assert (1 in bunch_view) and (2 in bunch_view)
     assert 0 not in bunch_view
     assert bunch_view.members(dtype=dict) == {1: {1, 2, 4}, 2: {2, 3, 4, 5}}
     with pytest.raises(IDNotFound):
         bunch_view.members(0)
+    # test ID order
+    assert list(bunch_view) == [1, 2]
 
 
 def test_call_wrong_bunch():

diff --git a/tests/core/test_views.py b/tests/core/test_views.py
@@ -210,14 +210,16 @@ def test_view_len(edgelist2):
 
 def test_bunch_view(edgelist1):
     H = xgi.Hypergraph(edgelist1)
-    bunch_view = H.edges.from_view(H.edges, bunch=[1, 2])
+    bunch_view = H.edges.from_view(H.edges, bunch=[2, 1])
     assert len(bunch_view) == 2
     assert (1 in bunch_view) and (2 in bunch_view)
     assert 0 not in bunch_view
     assert bunch_view.members(dtype=dict) == {1: {4}, 2: {5, 6}}
     with pytest.raises(IDNotFound):
         bunch_view.members(0)
 
+    assert list(bunch_view) == [1, 2]
+
 
 def test_call_wrong_bunch():
     H = xgi.Hypergraph()

diff --git a/xgi/core/diviews.py b/xgi/core/diviews.py
@@ -365,7 +365,7 @@ def from_view(cls, view, bunch=None):
             wrong = bunch - all_ids
             if wrong:
                 raise IDNotFound(f"IDs {wrong} not in the hypergraph")
-            newview._ids = bunch
+            newview._ids = [i for i in view._in_id_dict if i in bunch]
         return newview
 
     def _from_iterable(self, it):

diff --git a/xgi/core/views.py b/xgi/core/views.py
@@ -511,7 +511,7 @@ def from_view(cls, view, bunch=None):
             wrong = bunch - all_ids
             if wrong:
                 raise IDNotFound(f"IDs {wrong} not in the hypergraph")
-            newview._ids = bunch
+            newview._ids = [i for i in view._id_dict if i in bunch]
         return newview
 
     def _from_iterable(self, it):