Skip to content

Commit e5b1ede

Browse files
SuxiaocaiSuxiaocai
committed
fix louvain
1 parent 7997f0c commit e5b1ede

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

‎algorithms/examples/Community/louvain_parallel.gsql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ CREATE QUERY louvain_parallel(INT iter1 = 10, INT iter2 = 10, INT iter3 = 10, IN
9393
Iter1 = iter1 - 1;
9494

9595
WHILE (iteration < 2 OR @@modularity - last_modularity > epsilon) LIMIT Iter1 DO
96-
iteration += 1;
96+
iteration = iteration + 1;
9797
loop = 0;
9898
WHILE (loop < partitions) DO
9999
S = SELECT s
@@ -139,7 +139,7 @@ CREATE QUERY louvain_parallel(INT iter1 = 10, INT iter2 = 10, INT iter3 = 10, IN
139139
# Phase 2 -- Merge
140140
iteration2 = 0;
141141
WHILE (iteration2 < 2 OR @@modularity2 - last_modularity2 > epsilon) LIMIT iter2 DO
142-
iteration2 += 1;
142+
iteration2 = iteration2 + 1;
143143
Start = SELECT s
144144
FROM Start:s
145145
ACCUM s.@uid = s.@cid;
@@ -168,7 +168,7 @@ CREATE QUERY louvain_parallel(INT iter1 = 10, INT iter2 = 10, INT iter3 = 10, IN
168168
@@modularity = 0;
169169

170170
WHILE (iteration < 2 OR @@modularity - last_modularity > epsilon) limit iter1 DO
171-
iteration += 1;
171+
iteration = iteration + 1;
172172

173173
# Calculate.weight incident from vertex to cluster in coarsened graph; change every interation
174174
S = SELECT s
@@ -241,7 +241,7 @@ CREATE QUERY louvain_parallel(INT iter1 = 10, INT iter2 = 10, INT iter3 = 10, IN
241241
iteration = 0;
242242
@@modularity = 0;
243243
WHILE (iteration < 2 OR @@modularity - last_modularity > epsilon) LIMIT iter3 DO
244-
iteration += 1;
244+
iteration = iteration + 1;
245245
S = SELECT s
246246
FROM Start:s -(Coworker:e)-> :t
247247
WHERE abs(s.@weight - @@totIncidentCluster.get(s.@cid)) > epsilon OR abs(t.@weight - @@totIncidentCluster.get(t.@cid)) > epsilon OR (abs(s.@weight - @@totIncidentCluster.get(s.@cid)) < epsilon AND abs(t.@weight - @@totIncidentCluster.get(t.@cid)) < epsilon AND s.@cid > t.@cid) # at least one cluster not only itself, or use smaller label

‎algorithms/examples/Community/louvain_parallel_attr.gsql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ CREATE QUERY louvain_parallel_attr(INT iter1 = 10, INT iter2 = 10, INT iter3 = 1
9393
Iter1 = iter1 - 1;
9494

9595
WHILE (iteration < 2 OR @@modularity - last_modularity > epsilon) LIMIT Iter1 DO
96-
iteration += 1;
96+
iteration = iteration + 1;
9797
loop = 0;
9898
WHILE (loop < partitions) DO
9999
S = SELECT s
@@ -139,7 +139,7 @@ CREATE QUERY louvain_parallel_attr(INT iter1 = 10, INT iter2 = 10, INT iter3 = 1
139139
# Phase 2 -- Merge
140140
iteration2 = 0;
141141
WHILE (iteration2 < 2 OR @@modularity2 - last_modularity2 > epsilon) LIMIT iter2 DO
142-
iteration2 += 1;
142+
iteration2 = iteration2 + 1;
143143
Start = SELECT s
144144
FROM Start:s
145145
ACCUM s.@uid = s.@cid;
@@ -168,7 +168,7 @@ CREATE QUERY louvain_parallel_attr(INT iter1 = 10, INT iter2 = 10, INT iter3 = 1
168168
@@modularity = 0;
169169

170170
WHILE (iteration < 2 OR @@modularity - last_modularity > epsilon) limit iter1 DO
171-
iteration += 1;
171+
iteration = iteration + 1;
172172

173173
# Calculate.weight incident from vertex to cluster in coarsened graph; change every interation
174174
S = SELECT s
@@ -241,7 +241,7 @@ CREATE QUERY louvain_parallel_attr(INT iter1 = 10, INT iter2 = 10, INT iter3 = 1
241241
iteration = 0;
242242
@@modularity = 0;
243243
WHILE (iteration < 2 OR @@modularity - last_modularity > epsilon) LIMIT iter3 DO
244-
iteration += 1;
244+
iteration = iteration + 1;
245245
S = SELECT s
246246
FROM Start:s -(Coworker:e)-> :t
247247
WHERE abs(s.@weight - @@totIncidentCluster.get(s.@cid)) > epsilon OR abs(t.@weight - @@totIncidentCluster.get(t.@cid)) > epsilon OR (abs(s.@weight - @@totIncidentCluster.get(s.@cid)) < epsilon AND abs(t.@weight - @@totIncidentCluster.get(t.@cid)) < epsilon AND s.@cid > t.@cid) # at least one cluster not only itself, or use smaller label

‎algorithms/examples/Community/louvain_parallel_file.gsql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
Iter1 = iter1 - 1;
9494

9595
WHILE (iteration < 2 OR @@modularity - last_modularity > epsilon) LIMIT Iter1 DO
96-
iteration += 1;
96+
iteration = iteration + 1;
9797
loop = 0;
9898
WHILE (loop < partitions) DO
9999
S = SELECT s
@@ -139,7 +139,7 @@
139139
# Phase 2 -- Merge
140140
iteration2 = 0;
141141
WHILE (iteration2 < 2 OR @@modularity2 - last_modularity2 > epsilon) LIMIT iter2 DO
142-
iteration2 += 1;
142+
iteration2 = iteration2 + 1;
143143
Start = SELECT s
144144
FROM Start:s
145145
ACCUM s.@uid = s.@cid;
@@ -168,7 +168,7 @@
168168
@@modularity = 0;
169169

170170
WHILE (iteration < 2 OR @@modularity - last_modularity > epsilon) limit iter1 DO
171-
iteration += 1;
171+
iteration = iteration + 1;
172172

173173
# Calculate.weight incident from vertex to cluster in coarsened graph; change every interation
174174
S = SELECT s
@@ -241,7 +241,7 @@
241241
iteration = 0;
242242
@@modularity = 0;
243243
WHILE (iteration < 2 OR @@modularity - last_modularity > epsilon) LIMIT iter3 DO
244-
iteration += 1;
244+
iteration = iteration + 1;
245245
S = SELECT s
246246
FROM Start:s -(Coworker:e)-> :t
247247
WHERE abs(s.@weight - @@totIncidentCluster.get(s.@cid)) > epsilon OR abs(t.@weight - @@totIncidentCluster.get(t.@cid)) > epsilon OR (abs(s.@weight - @@totIncidentCluster.get(s.@cid)) < epsilon AND abs(t.@weight - @@totIncidentCluster.get(t.@cid)) < epsilon AND s.@cid > t.@cid) # at least one cluster not only itself, or use smaller label

‎algorithms/templates/louvain_parallel.gtmp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
Iter1 = iter1 - 1;
9696

9797
WHILE (iteration < 2 OR @@modularity - last_modularity > epsilon) LIMIT Iter1 DO
98-
iteration += 1;
98+
iteration = iteration + 1;
9999
loop = 0;
100100
WHILE (loop < partitions) DO
101101
S = SELECT s
@@ -141,7 +141,7 @@
141141
# Phase 2 -- Merge
142142
iteration2 = 0;
143143
WHILE (iteration2 < 2 OR @@modularity2 - last_modularity2 > epsilon) LIMIT iter2 DO
144-
iteration2 += 1;
144+
iteration2 = iteration2 + 1;
145145
Start = SELECT s
146146
FROM Start:s
147147
ACCUM s.@uid = s.@cid;
@@ -170,7 +170,7 @@
170170
@@modularity = 0;
171171

172172
WHILE (iteration < 2 OR @@modularity - last_modularity > epsilon) limit iter1 DO
173-
iteration += 1;
173+
iteration = iteration + 1;
174174

175175
# Calculate.*edge-weight* incident from vertex to cluster in coarsened graph; change every interation
176176
S = SELECT s
@@ -243,7 +243,7 @@
243243
iteration = 0;
244244
@@modularity = 0;
245245
WHILE (iteration < 2 OR @@modularity - last_modularity > epsilon) LIMIT iter3 DO
246-
iteration += 1;
246+
iteration = iteration + 1;
247247
S = SELECT s
248248
FROM Start:s -(*edge-types*:e)-> :t
249249
WHERE abs(s.@weight - @@totIncidentCluster.get(s.@cid)) > epsilon OR abs(t.@weight - @@totIncidentCluster.get(t.@cid)) > epsilon OR (abs(s.@weight - @@totIncidentCluster.get(s.@cid)) < epsilon AND abs(t.@weight - @@totIncidentCluster.get(t.@cid)) < epsilon AND s.@cid > t.@cid) # at least one cluster not only itself, or use smaller label

0 commit comments

Comments
 (0)