More fixes

Author: amontoison

src/decompression.jl

@@ -728,16 +728,21 @@ function decompress!(
     fill!(A, zero(eltype(A)))
 
     ind_Bc = 1
+    ind_Br = nnz(S)
     rvS = rowvals(S)
     for j in axes(S, 2)
         for k in nzrange(S, j)
             i = rvS[k]
-            index = compressed_indices[k]
-            if A_indices[ind_Bc] == k && ind_Bc <= pos_Bc
-                A[i, j] = Bc[index]
-                ind_Bc += 1
+            index_Bc = compressed_indices[ind_Bc]
+            if A_indices[ind_Bc] == k
+                A[i, j] = Bc[index_Bc]
+                if ind_Bc < pos_Bc
+                    ind_Bc += 1
+                end
             else
-                A[i, j] = Br[index]
+                index_Br = compressed_indices[ind_Br]
+                A[i, j] = Br[index_Br]
+                ind_Br -= 1
             end
         end
     end
@@ -806,13 +811,13 @@ function decompress!(
             (i, j) = reverse_bfs_orders[pos]
             cj = symmetric_color[j]
             if in_triangle(i, j, :L)
-                val = Bc[i, symmetric_to_column[cj]] - buffer_right_type[i]
+                val = Bc[i - n, symmetric_to_column[cj]] - buffer_right_type[i]
                 buffer_right_type[j] = buffer_right_type[j] + val
-                A[i, j] = val
+                A[i - n, j] = val
             else
                 val = Br[symmetric_to_row[cj], i] - buffer_right_type[i]
                 buffer_right_type[j] = buffer_right_type[j] + val
-                A[j, i] = val
+                A[j - n, i] = val
             end
         end
     end
@@ -865,13 +870,13 @@ function decompress!(
 
         for pos in first:last
             (i, j) = reverse_bfs_orders[pos]
-            counter += 1
             cj = symmetric_color[j]
+            counter += 1
 
             #! format: off
             # A[i,j] is in the lower triangular part of A
             if in_triangle(i, j, :L)
-                val = Bc[i, symmetric_to_column[cj]] - buffer_right_type[i]
+                val = Bc[i - n, symmetric_to_column[cj]] - buffer_right_type[i]
                 buffer_right_type[j] = buffer_right_type[j] + val
 
                 # A[i,j] is stored at index_ij = A_indices[counter] in A.nzval

src/result.jl

@@ -647,9 +647,9 @@ function StarSetBicoloringResult(
                 pos_Bc += 1
                 A_indices[pos_Bc] = k
                 compressed_indices[pos_Bc] = (symmetric_to_column[c] - 1) * m + i
-            else  # i == h
-                # i is the hub and j is the spoke
-                c = symmetric_color[i]
+            else  # i + n == h
+                # (i + n) is the hub and j is the spoke
+                c = symmetric_color[i + n]
 
                 # A[i, j] = Br[symmetric_to_row[c], j]
                 pos_Br -= 1
@@ -752,26 +752,23 @@ function TreeSetBicoloringResult(
 
         for pos in first:last
             (leaf, neighbor) = reverse_bfs_orders[pos]
-            index += 1
-
             i = leaf
             j = neighbor
-            col_i = view(rv, nzrange(S, i))
-            col_j = view(rv, nzrange(S, j))
+            index += 1
 
             #! format: off
             # S[i,j] is in the lower triangular part of S
             if in_triangle(i, j, :L)
                 # S[i,j] is stored at index_ij = (S.colptr[j] + offset) in S.nzval
                 col_j = view(rv, nzrange(S, j))
-                offset = searchsortedfirst(col_j, i)::Int - 1
+                offset = searchsortedfirst(col_j, i-n)::Int - 1
                 A_indices[index] = S.colptr[j] + offset
 
             # S[i,j] is in the upper triangular part of S
             else
                 # S[j,i] is stored at index_ji = (S.colptr[i] + offset) in S.nzval
                 col_i = view(rv, nzrange(S, i))
-                offset = searchsortedfirst(col_i, j)::Int - 1
+                offset = searchsortedfirst(col_i, j-n)::Int - 1
                 A_indices[index] = S.colptr[i] + offset
             end
             #! format: on