Skip to content

Commit 880290b

Browse files
committed
update tests
1 parent 4d4dddd commit 880290b

File tree

1 file changed

+22
-40
lines changed

1 file changed

+22
-40
lines changed

src/schedulers/dpmsolver_singlestep.rs

+22-40
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ fn get_order_list(steps: usize, solver_order: usize, lower_order_final: bool) ->
415415
if solver_order == 3 {
416416
repeat(&[1, 2, 3][..]).take(steps / 3).flatten().map(|v| *v).collect()
417417
} else if solver_order == 2 {
418-
repeat(dbg!(&[1, 2][..])).take(dbg!(steps / 2)).flatten().map(|v| dbg!(*v)).collect()
418+
repeat(&[1, 2][..]).take(steps / 2).flatten().map(|v| *v).collect()
419419
} else if solver_order == 1 {
420420
repeat(&[1][..]).take(steps).flatten().map(|v| *v).collect()
421421
} else {
@@ -430,52 +430,34 @@ mod tests {
430430

431431
#[test]
432432
fn order_list() {
433-
let list = get_order_list(15, 2, false);
433+
assert_eq!(get_order_list(15, 2, false), vec![1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2],);
434434

435-
assert_eq!(15, list.len());
436-
assert_eq!(vec![1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2], list);
437-
438-
let list = get_order_list(16, 2, false);
439-
440-
assert_eq!(16, list.len());
441-
assert_eq!(vec![1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2], list);
442-
443-
let list = get_order_list(16, 1, false);
444-
445-
assert_eq!(16, list.len());
446-
assert_eq!(vec![1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], list);
447-
448-
let list = get_order_list(16, 3, false);
449-
450-
assert_eq!(16, list.len());
451-
assert_eq!(vec![1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3], list);
452-
453-
let list = get_order_list(16, 3, true);
454-
455-
assert_eq!(16, list.len());
456-
assert_eq!(vec![1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1], list);
457-
458-
let list = get_order_list(16, 1, true);
459-
460-
assert_eq!(16, list.len());
461-
assert_eq!(vec![1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], list);
435+
assert_eq!(
436+
get_order_list(16, 2, false),
437+
vec![1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2]
438+
);
462439

463-
let list = get_order_list(25, 1, true);
440+
assert_eq!(
441+
get_order_list(16, 1, false),
442+
vec![1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
443+
);
464444

465-
assert_eq!(25, list.len());
445+
assert_eq!(get_order_list(16, 3, false), vec![1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3]);
446+
assert_eq!(
447+
get_order_list(16, 3, true),
448+
vec![1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1]
449+
);
450+
assert_eq!(
451+
get_order_list(16, 1, true),
452+
vec![1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
453+
);
466454
assert_eq!(
455+
get_order_list(25, 1, true),
467456
vec![1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
468-
list
469457
);
470458

471-
let list = get_order_list(1, 1, true);
472-
473-
assert_eq!(1, list.len());
474-
assert_eq!(vec![1], list);
475-
476-
let list = get_order_list(2, 2, true);
459+
assert_eq!(get_order_list(1, 1, true), vec![1]);
477460

478-
assert_eq!(2, list.len());
479-
assert_eq!(vec![1, 2], list);
461+
assert_eq!(get_order_list(2, 2, true), vec![1, 2]);
480462
}
481463
}

0 commit comments

Comments
 (0)