Skip to content

Commit 714b859

Browse files
Some fixes and added argmax op to MISLouvain
1 parent ae2bd38 commit 714b859

File tree

5 files changed

+519
-253
lines changed

5 files changed

+519
-253
lines changed

experimental/algorithm/LAGraph_Louvain.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ int LAGraph_Louvain(
105105
GRB_TRY(GrB_Matrix_diag(&S,x,0));
106106
GRB_TRY(GrB_set(S,false,GxB_ISO));
107107
GrB_set (S, GxB_SPARSE, GxB_SPARSITY_CONTROL);
108-
GxB_print(S,5);
108+
// GxB_print(S,5);
109109

110110
//var used in for loop
111111
GrB_Index vertices_changed;
@@ -130,7 +130,7 @@ int LAGraph_Louvain(
130130
for(int i=0;i<n;i++){//extract tuples
131131
// v = A(i,:)
132132
GRB_TRY (GrB_Col_extract (v, NULL, NULL, A, GrB_ALL, b, i,GrB_DESC_T0));
133-
GxB_print(v,5);
133+
// GxB_print(v,5);
134134

135135
// -- extract k_i
136136
GRB_TRY(GrB_Vector_extractElement_FP64(&k_i,k,i));
@@ -142,7 +142,7 @@ int LAGraph_Louvain(
142142
// sr = S(i,:)
143143

144144
GRB_TRY(GrB_Col_extract(sr,NULL,NULL,S,GrB_ALL,1,i,GrB_DESC_T0));
145-
GxB_print(sr,5);
145+
// GxB_print(sr,5);
146146

147147
//S(i,:) = empty
148148
GRB_TRY(GxB_unload_Matrix_into_Container(S,S_container,NULL));
@@ -162,19 +162,19 @@ int LAGraph_Louvain(
162162

163163
//q += v
164164
GRB_TRY(GrB_eWiseAdd(q,NULL,NULL,plusf64,q,v,NULL));
165-
GxB_print(q,5);
165+
// GxB_print(q,5);
166166

167167
//q_1<t_q> = q +.x S O(n)
168168
GRB_TRY(GrB_Vector_clear(q1));
169-
GxB_print(S,5);
169+
// GxB_print(S,5);
170170
GRB_TRY(GrB_vxm(q1,t_q,NULL,stdmxm,q,S,GrB_DESC_S));
171-
GxB_print(q1,5);
171+
// GxB_print(q1,5);
172172
//t = (q1 == [max_i q_1(i)])
173173
double max_q1=0;
174174
GRB_TRY(GrB_Vector_reduce_FP64(&max_q1,NULL,GrB_MAX_MONOID_FP64,q1,NULL));
175-
printf("%ld",max_q1);
175+
// printf("%ld",max_q1);
176176
GRB_TRY(GrB_Vector_select_FP64(t,NULL,NULL,GrB_VALUEEQ_FP64,q1,max_q1,NULL));
177-
GxB_print(t,5);
177+
// GxB_print(t,5);
178178

179179

180180
GRB_TRY(GrB_Vector_nvals(&nvals_t,t));
@@ -189,13 +189,13 @@ int LAGraph_Louvain(
189189
double y = rd();
190190
GRB_TRY(GrB_Vector_setElement_FP64(p,y*p_vals[j],p_cs[j]));
191191
}
192-
GxB_print(p,5);
192+
// GxB_print(p,5);
193193
//t = (p== [max_i p_1(i)])
194194
double max_p;
195195
GRB_TRY(GrB_Vector_reduce_FP64(&max_p,NULL,maxmon,p,NULL));
196196
// printf("max_p:%f\n",max_p);
197197
GRB_TRY(GrB_Vector_select_FP64(t,NULL,NULL,GrB_VALUEEQ_FP64,p,max_p,NULL));
198-
GxB_print(t,5);
198+
// GxB_print(t,5);
199199
GRB_TRY(GrB_Vector_nvals(&nvals_t,t));
200200
free(p_cs);
201201
free(p_vals);

0 commit comments

Comments
 (0)