Skip to content

Commit a49e57b

Browse files
Merge branch 'main' into dependabot/cargo/rand-0.10.1
2 parents ab0c558 + 430220b commit a49e57b

2 files changed

Lines changed: 29 additions & 5 deletions

File tree

src/lib.rs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,11 @@ pub struct ImagePair {
7777

7878
impl ImagePair {
7979
/// Construct a new `ImagePair` from the given paths and original file size.
80-
pub fn new(original: impl Into<String>, decoded: impl Into<String>, original_size: u64) -> Self {
80+
pub fn new(
81+
original: impl Into<String>,
82+
decoded: impl Into<String>,
83+
original_size: u64,
84+
) -> Self {
8185
Self {
8286
original: original.into(),
8387
decoded: decoded.into(),
@@ -138,7 +142,14 @@ pub fn assign_split_by_index(index: usize, total: usize) -> Split {
138142
///
139143
/// The partition is deterministic given a pre-ordered (e.g. shuffled) slice.
140144
/// Returns `(train, test, val, calibration)`.
141-
pub fn partition_pairs(pairs: &[ImagePair]) -> (Vec<&ImagePair>, Vec<&ImagePair>, Vec<&ImagePair>, Vec<&ImagePair>) {
145+
pub fn partition_pairs(
146+
pairs: &[ImagePair],
147+
) -> (
148+
Vec<&ImagePair>,
149+
Vec<&ImagePair>,
150+
Vec<&ImagePair>,
151+
Vec<&ImagePair>,
152+
) {
142153
let total = pairs.len();
143154
let mut train = Vec::new();
144155
let mut test = Vec::new();

tests/smoke_test.rs

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,11 @@ fn split_all_contains_four_unique_variants() {
7575
// Verify there are no duplicates by comparing hash-equality.
7676
use std::collections::HashSet;
7777
let set: HashSet<_> = all.iter().collect();
78-
assert_eq!(set.len(), 4, "Split::all() must not contain duplicate variants");
78+
assert_eq!(
79+
set.len(),
80+
4,
81+
"Split::all() must not contain duplicate variants"
82+
);
7983
}
8084

8185
// ---------------------------------------------------------------------------
@@ -213,7 +217,10 @@ fn assign_split_by_index_single_item_documented_behaviour() {
213217
let split = assign_split_by_index(0, 1);
214218
// Must be a valid variant (no panic or undefined behaviour).
215219
assert!(
216-
matches!(split, Split::Train | Split::Test | Split::Val | Split::Calibration),
220+
matches!(
221+
split,
222+
Split::Train | Split::Test | Split::Val | Split::Calibration
223+
),
217224
"must return a valid Split for single-item dataset"
218225
);
219226
}
@@ -236,7 +243,13 @@ fn partition_pairs_empty_slice_produces_empty_vecs() {
236243
#[test]
237244
fn partition_pairs_total_count_equals_input_length() {
238245
let pairs: Vec<ImagePair> = (0..200)
239-
.map(|i| ImagePair::new(format!("orig/{}.png", i), format!("dec/{}.png", i), i as u64 * 1024))
246+
.map(|i| {
247+
ImagePair::new(
248+
format!("orig/{}.png", i),
249+
format!("dec/{}.png", i),
250+
i as u64 * 1024,
251+
)
252+
})
240253
.collect();
241254

242255
let (train, test, val, calibration) = partition_pairs(&pairs);

0 commit comments

Comments
 (0)