Skip to content

Commit 45b16a3

Browse files
committed
More tests
1 parent 3937800 commit 45b16a3

2 files changed

Lines changed: 22 additions & 11 deletions

File tree

src/structured.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ function coloring(
7070
algo::GreedyColoringAlgorithm;
7171
kwargs...,
7272
)
73-
color = cycle_range(1:2, size(A, 2))
73+
color = cycle_range(2, size(A, 2))
7474
bg = BipartiteGraph(A)
7575
return ColumnColoringResult(A, bg, color)
7676
end
@@ -81,7 +81,7 @@ function coloring(
8181
algo::GreedyColoringAlgorithm;
8282
kwargs...,
8383
)
84-
color = cycle_range(1:2, size(A, 1))
84+
color = cycle_range(2, size(A, 1))
8585
bg = BipartiteGraph(A)
8686
return RowColoringResult(A, bg, color)
8787
end
@@ -126,7 +126,7 @@ function coloring(
126126
algo::GreedyColoringAlgorithm;
127127
kwargs...,
128128
)
129-
color = cycle_range(1:3, size(A, 2))
129+
color = cycle_range(3, size(A, 2))
130130
bg = BipartiteGraph(A)
131131
return ColumnColoringResult(A, bg, color)
132132
end
@@ -137,7 +137,7 @@ function coloring(
137137
algo::GreedyColoringAlgorithm;
138138
kwargs...,
139139
)
140-
color = cycle_range(1:3, size(A, 1))
140+
color = cycle_range(3, size(A, 1))
141141
bg = BipartiteGraph(A)
142142
return RowColoringResult(A, bg, color)
143143
end

test/structured.jl

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,16 @@ end
2626
result = coloring(A, column_problem, algo)
2727
B = compress(A, result)
2828
@test size(B, 2) == 1
29-
@test decompress(B, result) == A
29+
D = decompress(B, result)
30+
@test D == A
31+
@test D isa Diagonal
3032
# row
3133
result = coloring(A, row_problem, algo)
3234
B = compress(A, result)
3335
@test size(B, 1) == 1
34-
@test decompress(B, result) == A
36+
D = decompress(B, result)
37+
@test D == A
38+
@test D isa Diagonal
3539
end
3640
end
3741

@@ -44,12 +48,16 @@ end
4448
result = coloring(A, column_problem, algo)
4549
B = compress(A, result)
4650
@test size(B, 2) == 2
47-
@test decompress(B, result) == A
51+
D = decompress(B, result)
52+
@test D == A
53+
@test D isa Bidiagonal
4854
# row
4955
result = coloring(A, row_problem, algo)
5056
B = compress(A, result)
5157
@test size(B, 1) == 2
52-
@test decompress(B, result) == A
58+
D = decompress(B, result)
59+
@test D == A
60+
@test D isa Bidiagonal
5361
end
5462
end
5563
end
@@ -63,12 +71,15 @@ end
6371
result = coloring(A, column_problem, algo)
6472
B = compress(A, result)
6573
@test size(B, 2) == min(n, 3)
66-
@test decompress(B, result) == A
67-
# row
74+
D = decompress(B, result)
75+
@test D == A
76+
@test D isa Tridiagonal # row
6877
result = coloring(A, row_problem, algo)
6978
B = compress(A, result)
7079
@test size(B, 1) == min(n, 3)
71-
@test decompress(B, result) == A
80+
D = decompress(B, result)
81+
@test D == A
82+
@test D isa Tridiagonal
7283
end
7384
end
7485
end

0 commit comments

Comments
 (0)