@@ -5,8 +5,7 @@ const path = require('path');
5
5
const ROMPTH = / ^ O M P _ N U M _ T H R E A D S = ( \d + ) / ;
6
6
const RGRAPH = / ^ L o a d i n g g r a p h .* \/ ( .* ?) \. m t x \. \. \. / m;
7
7
const RORDER = / ^ o r d e r : ( \d + ) s i z e : ( \d + ) (?: \[ \w + \] ) ? \{ \} / m;
8
- const RRESLT = / ^ \{ ( .+ ?) m s , ( .+ ?) m s m a r k , ( .+ ?) m s i n i t , ( .+ ?) m s f i r s t p a s s , ( .+ ?) m s l o c m o v e , ( .+ ?) m s r e f i n e , ( .+ ?) m s a g g r , ( .+ ?) a f f , ( .+ ?) i t e r s , ( .+ ?) p a s s e s , ( .+ ?) m o d u l a r i t y , ( .+ ?) \/ ( .+ ?) d i s c o n n e c t e d \} ( .+ ) / m;
9
-
8
+ const RRESLT = / ^ \{ ( .+ ?) m s , ( .+ ?) m s m a r k , ( .+ ?) m s i n i t , ( .+ ?) m s f i r s t p a s s , ( .+ ?) m s l o c m o v e , ( .+ ?) m s r e f i n e , ( .+ ?) m s a g g r , ( .+ ?) s l o t s , ( .+ ?) i t e r s , ( .+ ?) p a s s e s , ( .+ ?) m o d u l a r i t y \} ( .+ ) / m;
10
9
11
10
12
11
@@ -60,7 +59,7 @@ function readLogLine(ln, data, state) {
60
59
state . size = parseFloat ( size ) ;
61
60
}
62
61
else if ( RRESLT . test ( ln ) ) {
63
- var [ , time , marking_time , initialization_time , first_pass_time , local_moving_phase_time , refinement_phase_time , aggregation_phase_time , affected_vertices , iterations , passes , modularity , disconnected_communities , total_communities , technique ] = RRESLT . exec ( ln ) ;
62
+ var [ , time , marking_time , initialization_time , first_pass_time , local_moving_phase_time , refinement_phase_time , aggregation_phase_time , number_of_slots , iterations , passes , modularity , technique ] = RRESLT . exec ( ln ) ;
64
63
data . get ( state . graph ) . push ( Object . assign ( { } , state , {
65
64
time : parseFloat ( time ) ,
66
65
marking_time : parseFloat ( marking_time ) ,
@@ -69,12 +68,10 @@ function readLogLine(ln, data, state) {
69
68
local_moving_phase_time : parseFloat ( local_moving_phase_time ) ,
70
69
refinement_phase_time : parseFloat ( refinement_phase_time ) ,
71
70
aggregation_phase_time : parseFloat ( aggregation_phase_time ) ,
72
- affected_vertices : parseFloat ( affected_vertices ) ,
71
+ number_of_slots : parseFloat ( number_of_slots ) ,
73
72
iterations : parseFloat ( iterations ) ,
74
73
passes : parseFloat ( passes ) ,
75
74
modularity : parseFloat ( modularity ) ,
76
- disconnected_communities : parseFloat ( disconnected_communities ) ,
77
- total_communities : parseFloat ( total_communities ) ,
78
75
technique,
79
76
} ) ) ;
80
77
}
0 commit comments