Merge pull request #14 from florian-huber/fix_merge_errors

Fix merge errors

Author: florian-huber

sparsestack/__version__.py

@@ -1 +1 @@
-__version__ = '0.4.0'
+__version__ = '0.4.1'

sparsestack/utils.py

@@ -120,7 +120,7 @@ def get_idx_inner(left_row, left_col, right_row, right_col,
     low = 0
     counter = 0
     for i in idx1:
-        for j in idx2[low:]:
+        for count, j in enumerate(idx2[low:]):
             if (left_row[i] == right_row[j]) and (left_col[i] == right_col[j]):
                 idx_left.append(i)
                 idx_left_new.append(counter)
@@ -129,8 +129,9 @@ def get_idx_inner(left_row, left_col, right_row, right_col,
                 row_new.append(left_row[i])
                 col_new.append(left_col[i])
                 counter += 1
+                low = count
             if left_row[i] > right_row[j]:
-                low = j
+                low = count
             if left_row[i] < right_row[j]:
                 break
     return idx_left, idx_right, idx_left_new, idx_right_new, row_new, col_new
@@ -159,12 +160,12 @@ def get_idx_outer(left_row, left_col, right_row, right_col,
     counter = 0
     for i in idx1:
         current_match = False
-        for j in idx2[low:]:
+        for count, j in enumerate(idx2[low:]):
             if (left_row[i] == right_row[j]) and (left_col[i] == right_col[j]):
                 right_in_inner.append(j)
                 current_match = True
             if left_row[i] > right_row[j]:
-                low = j
+                low = count
             if left_row[i] < right_row[j]:
                 break
         if current_match:

tests/test_utils.py

@@ -43,3 +43,44 @@ def test_join_arrays_join_types(join_type, expected_data, expected_row):
                                  join_type=join_type)
     assert np.allclose(np.array([[x[0], x[1]] for x in data]), expected_data)
     assert np.allclose(row, expected_row)
+
+
+@pytest.mark.parametrize("join_type, expected_data, expected_row", [
+    ["left", np.array([[0, 0], [1, 0], [2, 2], [4, 0], [5, 5]]), np.array([0, 1, 2, 4, 5])],
+    ["right", np.array([[2, 2],[0, 3], [5, 5], [0, 6], [0, 7],]), np.array([2, 3, 5, 6, 7])],
+    ["inner", np.array([[2, 2], [5, 5]]), np.array([2, 5])],
+    ["outer", np.array([[0, 0], [1, 0], [2, 2], [0, 3], [4, 0], [5, 5], [0, 6], [0, 7]]),
+     np.array([0, 1, 2, 3, 4, 5, 6, 7])],
+])
+def test_join_arrays_join_types(join_type, expected_data, expected_row):
+    row1 = np.array([0, 1, 2, 4, 5])
+    col1 = np.array([0, 1, 2, 4, 5])
+    row2 = np.array([7, 5, 3, 6, 2])
+    col2 = np.array([7, 5, 3, 6, 2])
+    data1 = np.array(col1, dtype=[("layer1", col1.dtype)])
+    data2 = np.array(col2, dtype=[("layer2", col2.dtype)])
+
+    row, col, data = join_arrays(row1, col1, data1, row2, col2, data2, "test1",
+                                 join_type=join_type)
+    assert np.allclose(np.array([[x[0], x[1]] for x in data]), expected_data)
+    assert np.allclose(row, expected_row)
+
+
+@pytest.mark.parametrize("join_type", [
+    "left", "right", "inner", "outer"
+])
+def test_join_arrays_larger(join_type):
+    """Joining two identical arrays should always give the same result."""
+    row = np.array([ 0,  1,  2,  3,  4,  5,  6,  6, 15,  7,  7,  8,  7,  9,  7, 10,  7,
+                    11,  8,  8,  9,  8, 10,  8, 11,  9,  9, 10,  9, 11, 10, 10, 11, 11,
+                    12, 12, 13, 13, 14, 15, 16, 17, 18, 19])
+
+    col = np.array([ 0,  1,  2,  3,  4,  5,  6, 15,  6,  7,  8,  7,  9,  7, 10,  7, 11, 
+                    7,  8,  9,  8, 10,  8, 11,  8,  9, 10,  9, 11,  9, 10, 11, 10, 11,
+                    12, 13, 12, 13, 14, 15, 16, 17, 18, 19])
+    data1 = np.array(np.arange(0, len(col)), dtype=[("layer1", col.dtype)])
+    data2 = np.array(np.arange(0, len(col)), dtype=[("layer2", col.dtype)])
+
+    row_out, col_out, data_out = join_arrays(row, col, data1, row, col, data2, "test1",
+                                 join_type=join_type)
+    assert np.allclose(sorted(data_out["test1_layer2"]), sorted(np.array([x[0] for x in data2])))