Skip to content

Commit bfc3fec

Browse files
vignavigna
committed
Fixed field names
1 parent b4ff1cd commit bfc3fec

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

‎algo/src/visits/breadth_first/mod.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,11 @@ pub enum EventPred {
6969
/// distance or when all nodes at that distance have been visited, depending
7070
/// on the implementation.
7171
FrontierSize {
72-
/// The number of nodes visited at that distance.
73-
nodes: usize,
74-
/// The distance of the nodes visited.
72+
/// A distance.
7573
distance: usize,
74+
/// The number of nodes at
75+
/// [`distance`](`EventNoPred::FrontierSize::distance`) from the roots.
76+
size: usize,
7677
},
7778
/// The visit has been completed.
7879
///
@@ -137,10 +138,11 @@ pub enum EventNoPred {
137138
/// distance or when all nodes at that distance have been visited, depending
138139
/// on the implementation.
139140
FrontierSize {
140-
/// The number of nodes visited at that distance.
141-
nodes: usize,
142-
/// The distance of the nodes visited.
141+
/// A distance.
143142
distance: usize,
143+
/// The number of nodes at
144+
/// [`distance`](`EventNoPred::FrontierSize::distance`) from the roots.
145+
sizes: usize,
144146
},
145147
/// The visit has been completed.
146148
///

‎algo/src/visits/breadth_first/par_fair.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ impl<G: RandomAccessGraph + Sync> Parallel<EventNoPred> for ParFair<G, false> {
192192
&mut init,
193193
EventNoPred::FrontierSize {
194194
distance,
195-
nodes: curr_frontier.len(),
195+
sizes: curr_frontier.len(),
196196
},
197197
)?;
198198
let distance_plus_one = distance + 1;
@@ -301,7 +301,7 @@ impl<G: RandomAccessGraph + Sync> Parallel<EventPred> for ParFair<G, true> {
301301
&mut init,
302302
EventPred::FrontierSize {
303303
distance,
304-
nodes: curr_frontier.len(),
304+
size: curr_frontier.len(),
305305
},
306306
)?;
307307
let distance_plus_one = distance + 1;

‎algo/src/visits/breadth_first/par_low_mem.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ impl<G: RandomAccessGraph + Sync> Parallel<EventPred> for ParLowMem<G> {
181181
&mut init,
182182
EventPred::FrontierSize {
183183
distance: distance - 1,
184-
nodes: curr_frontier.len(),
184+
size: curr_frontier.len(),
185185
},
186186
)?;
187187
thread_pool.install(|| {

‎algo/src/visits/breadth_first/seq.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ impl<G: RandomAccessGraph> Sequential<EventPred> for Seq<G> {
168168
&mut init,
169169
EventPred::FrontierSize {
170170
distance: 0,
171-
nodes: self.queue.len(),
171+
size: self.queue.len(),
172172
},
173173
)?;
174174

@@ -220,7 +220,7 @@ impl<G: RandomAccessGraph> Sequential<EventPred> for Seq<G> {
220220
&mut init,
221221
EventPred::FrontierSize {
222222
distance,
223-
nodes: self.queue.len(),
223+
size: self.queue.len(),
224224
},
225225
)?;
226226
distance += 1;

‎algo/tests/test_breadth_first.rs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ macro_rules! test_bfv_algo_seq {
175175
if let breadth_first::EventPred::Unknown { distance, .. } = event {
176176
*expected_distance_to_quantity.entry(distance).or_insert(0) += 1;
177177
}
178-
if let breadth_first::EventPred::FrontierSize { nodes, distance } = event {
179-
*distance_to_quantity.entry(distance).or_insert(0) += nodes;
178+
if let breadth_first::EventPred::FrontierSize { distance, size } = event {
179+
*distance_to_quantity.entry(distance).or_insert(0) += size;
180180
}
181181
Continue(())
182182
})
@@ -199,8 +199,8 @@ macro_rules! test_bfv_algo_seq {
199199
if let breadth_first::EventPred::Unknown { distance, .. } = event {
200200
*expected_distance_to_quantity.entry(distance).or_insert(0) += 1;
201201
}
202-
if let breadth_first::EventPred::FrontierSize { nodes, distance } = event {
203-
*distance_to_quantity.entry(distance).or_insert(0) += nodes;
202+
if let breadth_first::EventPred::FrontierSize { distance, size } = event {
203+
*distance_to_quantity.entry(distance).or_insert(0) += size;
204204
}
205205
Continue(())
206206
})
@@ -358,14 +358,13 @@ macro_rules! test_bfv_algo_par {
358358
.entry(distance)
359359
.or_insert(0) += 1;
360360
}
361-
if let breadth_first::EventPred::FrontierSize { nodes, distance } =
362-
event
361+
if let breadth_first::EventPred::FrontierSize { distance, size } = event
363362
{
364363
*distance_to_quantity
365364
.lock()
366365
.unwrap()
367366
.entry(distance)
368-
.or_insert(0) += nodes;
367+
.or_insert(0) += size;
369368
}
370369
Continue(())
371370
},
@@ -403,14 +402,13 @@ macro_rules! test_bfv_algo_par {
403402
.entry(distance)
404403
.or_insert(0) += 1;
405404
}
406-
if let breadth_first::EventPred::FrontierSize { nodes, distance } =
407-
event
405+
if let breadth_first::EventPred::FrontierSize { distance, size } = event
408406
{
409407
*distance_to_quantity
410408
.lock()
411409
.unwrap()
412410
.entry(distance)
413-
.or_insert(0) += nodes;
411+
.or_insert(0) += size;
414412
}
415413
Continue(())
416414
},

0 commit comments

Comments
 (0)