Last commit for tonight...

Author: amontoison

src/decompression.jl

@@ -718,35 +718,31 @@ end
 
 ## StarSetBicoloringResult
 
-# function decompress!(
-#     A::AbstractMatrix,
-#     Br::AbstractMatrix,
-#     Bc::AbstractMatrix,
-#     result::StarSetBicoloringResult,
-# )
-#     (; S, A_indices, compressed_indices, pos_Bc) = result
-#     fill!(A, zero(eltype(A)))
-
-#     ind_Br = 0
-#     ind_Bc = pos_Br
-#     counter = 0
-#     rvS = rowvals(S)
-#     for j in axes(S, 2)
-#         for k in nzrange(S, j)
-#             i = rvS[k]
-#             counter += 1
-#             ...
-#             if in_triangle(i, j, :L)
-#                 ind_Br += 1
-#                 A[i - n, j] = Br[compressed_indices[ind_Br]]
-#             else
-#                 ind_Bc += 1
-#                 A[j - n, i] = Bc[compressed_indices[ind_Bc]]
-#             end
-#         end
-#     end
-#     return A
-# end
+function decompress!(
+    A::AbstractMatrix,
+    Br::AbstractMatrix,
+    Bc::AbstractMatrix,
+    result::StarSetBicoloringResult,
+)
+    (; S, A_indices, compressed_indices, pos_Bc) = result
+    fill!(A, zero(eltype(A)))
+
+    ind_Bc = 1
+    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
+            else
+                A[i, j] = Br[index]
+            end
+        end
+    end
+    return A
+end
 
 function decompress!(
     A::SparseMatrixCSC,
@@ -810,13 +806,13 @@ function decompress!(
             (i, j) = reverse_bfs_orders[pos]
             cj = symmetric_color[j]
             if in_triangle(i, j, :L)
-                val = Bc[i - n, symmetric_to_column[cj]] - buffer_right_type[i]
+                val = Bc[i, symmetric_to_column[cj]] - buffer_right_type[i]
                 buffer_right_type[j] = buffer_right_type[j] + val
-                A[i - n, j] = val
+                A[i, 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 - n, i] = val
+                A[j, i] = val
             end
         end
     end
@@ -841,7 +837,6 @@ function decompress!(
     ) = result
 
     m, n = size(A)
-    A_colptr = A.colptr
     nzA = nonzeros(A)
 
     if eltype(buffer) == R
@@ -876,7 +871,7 @@ function decompress!(
             #! format: off
             # A[i,j] is in the lower triangular part of A
             if in_triangle(i, j, :L)
-                val = Bc[i - n, symmetric_to_column[cj]] - buffer_right_type[i]
+                val = Bc[i, 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