Skip to content

Commit 14d69d9

Browse files
committed
fix naming and remove print from tests
1 parent ab746fb commit 14d69d9

File tree

2 files changed

+15
-25
lines changed

2 files changed

+15
-25
lines changed

experimental/algorithm/LAGraph_CFL_AllPaths.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#define LG_FREE_WORK \
22
{ \
3-
GrB_free(&AllPaths_semiring_free); \
4-
GrB_free(&AllPaths_monoid_free); \
3+
GrB_free(&AllPaths_semiring); \
4+
GrB_free(&AllPaths_monoid); \
55
GrB_free(&AllPaths_monoid_get_nvals); \
66
GrB_free(&bottom_scalar); \
77
GrB_free(&IAllPaths_mult); \
88
GrB_free(&AllPaths_set); \
99
GrB_free(&AllPaths_mult); \
10-
GrB_free(&AllPaths_add_free); \
10+
GrB_free(&AllPaths_add); \
1111
GrB_free(&AllPaths_add_get_nvals); \
1212
GrB_free(&Theta); \
1313
GrB_free(&AllPaths_type); \
@@ -66,7 +66,7 @@ void clear_elem_all_paths(AllPathsElem *z){
6666
z->n = 0;
6767
}
6868

69-
void add_free_all_paths(AllPathsElem *z, AllPathsElem *x, AllPathsElem *y)
69+
void add_all_paths(AllPathsElem *z, AllPathsElem *x, AllPathsElem *y)
7070
{
7171
AllPathsElem temp;
7272
temp.middle = merge_all_paths(&temp.n, x->middle, x->n, y->middle, y->n);
@@ -167,12 +167,12 @@ GrB_Info LAGraph_CFL_AllPaths(
167167
{
168168
// Semiring components
169169
GrB_Type AllPaths_type = NULL;
170-
GrB_BinaryOp AllPaths_add_free = NULL;
170+
GrB_BinaryOp AllPaths_add = NULL;
171171
GrB_BinaryOp AllPaths_add_get_nvals = NULL;
172-
GrB_Monoid AllPaths_monoid_free = NULL;
172+
GrB_Monoid AllPaths_monoid = NULL;
173173
GxB_IndexBinaryOp IAllPaths_mult = NULL;
174174
GrB_BinaryOp AllPaths_mult = NULL;
175-
GrB_Semiring AllPaths_semiring_free = NULL;
175+
GrB_Semiring AllPaths_semiring = NULL;
176176
GrB_BinaryOp AllPaths_set = NULL;
177177
GrB_Scalar Theta = NULL;
178178
GrB_Scalar bottom_scalar = NULL;
@@ -189,15 +189,15 @@ GrB_Info LAGraph_CFL_AllPaths(
189189
GRB_TRY(GrB_Scalar_setElement_UDT(bottom_scalar, (void *)(&bottom)));
190190

191191
GRB_TRY(GrB_BinaryOp_new(
192-
&AllPaths_add_free,
193-
(void *)add_free_all_paths,
192+
&AllPaths_add,
193+
(void *)add_all_paths,
194194
AllPaths_type,
195195
AllPaths_type,
196196
AllPaths_type));
197197

198198
GRB_TRY(GrB_Monoid_new(
199-
&AllPaths_monoid_free,
200-
AllPaths_add_free,
199+
&AllPaths_monoid,
200+
AllPaths_add,
201201
(void *)(&bottom)));
202202

203203
GRB_TRY(GxB_IndexBinaryOp_new(
@@ -216,8 +216,8 @@ GrB_Info LAGraph_CFL_AllPaths(
216216
Theta));
217217

218218
GRB_TRY(GrB_Semiring_new(
219-
&AllPaths_semiring_free,
220-
AllPaths_monoid_free,
219+
&AllPaths_semiring,
220+
AllPaths_monoid,
221221
AllPaths_mult));
222222

223223
GRB_TRY(GrB_BinaryOp_new(
@@ -240,8 +240,8 @@ GrB_Info LAGraph_CFL_AllPaths(
240240
(void *)(&bottom)));
241241

242242
CFL_Semiring semiring = {.type = AllPaths_type,
243-
.semiring = AllPaths_semiring_free,
244-
.add = AllPaths_add_free,
243+
.semiring = AllPaths_semiring,
244+
.add = AllPaths_add,
245245
.mult = AllPaths_mult,
246246
.init_path = AllPaths_set,
247247
.bottom_scalar = bottom_scalar,

experimental/test/test_CFL_AllPaths.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -146,16 +146,6 @@ char *output_to_str(size_t nonterm)
146146
return result_str;
147147
}
148148

149-
void print_outputs(void)
150-
{
151-
for (size_t i = 0; i < grammar.nonterms_count; i++)
152-
{
153-
char *s = output_to_str(i);
154-
printf("Output[%zu]: %s\n", i, s[0] ? s : "(empty)");
155-
LAGraph_Free ((void **) &s, msg);
156-
}
157-
}
158-
159149
void free_workspace() {
160150

161151
if (adj_matrices != NULL)

0 commit comments

Comments
 (0)