replicating the tests from bioc.js

BiocPy · Sep 30, 2023 · 70ef05a · 70ef05a
1 parent a3a8a46
commit 70ef05a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/biocframe/BiocFrame.py b/src/biocframe/BiocFrame.py
@@ -770,26 +770,29 @@ def combine(self, *other: "BiocFrame") -> "BiocFrame":
 
         all_row_names = []
         all_num_rows = sum([len(x) for x in all_objects])
-        all_data = OrderedDict()
-        for obj in all_objects:
+        all_data = self.data.copy()
+        for obj in other:
             for ocol in all_unique_columns:
                 if ocol not in all_data:
                     all_data[ocol] = [None] * len(obj)
 
                 if ocol not in obj.column_names:
                     all_data[ocol] = [None] * len(obj)
                 else:
-                    all_data[ocol] = combine(obj.column(ocol), all_data[ocol])
+                    all_data[ocol] = combine(all_data[ocol], obj.column(ocol))
 
                 rnames = obj.row_names
                 if rnames is None:
                     rnames = [None] * all_num_rows
 
                 all_row_names.extend(rnames)
 
-        if all(all_row_names) is False:
+        if all(all_row_names) is False or len(all_row_names) == 0:
             all_row_names = None
 
+        print("allrownames", all_row_names)
+        print(all_data)
+
         current_class_const = type(self)
         return current_class_const(
             all_data,

diff --git a/tests/test_method_combine.py b/tests/test_method_combine.py
@@ -47,5 +47,5 @@ def test_basic_combine_empty():
     print(merged)
 
     assert isinstance(merged, BiocFrame)
-    assert merged.shape[0] == obj1.shape[0] + obj2.shape[0]
+    assert merged.shape[0] ==15
     assert merged.shape[1] == 0