Skip to content

Commit 48ca2be

Browse files
Make parts more Rust idiomatic
1 parent 56fa8ac commit 48ca2be

1 file changed

Lines changed: 40 additions & 40 deletions

File tree

‎neopdf/src/strategy.rs‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1580,7 +1580,7 @@ impl ChebyshevAllPids {
15801580
n: [0; 5],
15811581
ndim,
15821582
};
1583-
for d in 0..ndim {
1583+
(0..ndim).for_each(|d| {
15841584
let coords = &self.coords[d];
15851585
let n = coords.len();
15861586
let lo = coords[0];
@@ -1594,7 +1594,7 @@ impl ChebyshevAllPids {
15941594
&self.weights[d],
15951595
&mut loc.coeffs[d][..n],
15961596
);
1597-
}
1597+
});
15981598
loc
15991599
}
16001600

@@ -1647,19 +1647,19 @@ impl ChebyshevAllPids {
16471647
&loc.coeffs[2][..n2],
16481648
);
16491649
let mut result = 0.0_f64;
1650-
for i in 0..n0 {
1650+
(0..n0).for_each(|i| {
16511651
let mut acc_ij = 0.0_f64;
1652-
for j in 0..n1 {
1652+
(0..n1).for_each(|j| {
16531653
let base = (i * n1 + j) * n2;
16541654
let row = &vals[base..base + n2];
16551655
let mut acc_k = 0.0_f64;
16561656
for k in 0..n2 {
16571657
acc_k += c2[k] * row[k];
16581658
}
16591659
acc_ij += c1[j] * acc_k;
1660-
}
1660+
});
16611661
result += c0[i] * acc_ij;
1662-
}
1662+
});
16631663
result
16641664
}
16651665

@@ -1672,23 +1672,23 @@ impl ChebyshevAllPids {
16721672
&loc.coeffs[3][..n3],
16731673
);
16741674
let mut result = 0.0_f64;
1675-
for i in 0..n0 {
1675+
(0..n0).for_each(|i| {
16761676
let mut a3 = 0.0_f64;
1677-
for j in 0..n1 {
1677+
(0..n1).for_each(|j| {
16781678
let mut a2 = 0.0_f64;
1679-
for k in 0..n2 {
1679+
(0..n2).for_each(|k| {
16801680
let base = ((i * n1 + j) * n2 + k) * n3;
16811681
let row = &vals[base..base + n3];
16821682
let mut a1 = 0.0_f64;
16831683
for l in 0..n3 {
16841684
a1 += c3[l] * row[l];
16851685
}
16861686
a2 += c2[k] * a1;
1687-
}
1687+
});
16881688
a3 += c1[j] * a2;
1689-
}
1689+
});
16901690
result += c0[i] * a3;
1691-
}
1691+
});
16921692
result
16931693
}
16941694

@@ -1702,27 +1702,27 @@ impl ChebyshevAllPids {
17021702
&loc.coeffs[4][..n4],
17031703
);
17041704
let mut result = 0.0_f64;
1705-
for i in 0..n0 {
1705+
(0..n0).for_each(|i| {
17061706
let mut a4 = 0.0_f64;
1707-
for j in 0..n1 {
1707+
(0..n1).for_each(|j| {
17081708
let mut a3 = 0.0_f64;
1709-
for k in 0..n2 {
1709+
(0..n2).for_each(|k| {
17101710
let mut a2 = 0.0_f64;
1711-
for l in 0..n3 {
1711+
(0..n3).for_each(|l| {
17121712
let base = (((i * n1 + j) * n2 + k) * n3 + l) * n4;
17131713
let row = &vals[base..base + n4];
17141714
let mut a1 = 0.0_f64;
17151715
for m in 0..n4 {
17161716
a1 += c4[m] * row[m];
17171717
}
17181718
a2 += c3[l] * a1;
1719-
}
1719+
});
17201720
a3 += c2[k] * a2;
1721-
}
1721+
});
17221722
a4 += c1[j] * a3;
1723-
}
1723+
});
17241724
result += c0[i] * a4;
1725-
}
1725+
});
17261726
result
17271727
}
17281728
}
@@ -1836,9 +1836,9 @@ impl<const DIM: usize> LogChebyshevInterpolation<DIM> {
18361836
sum += term;
18371837
}
18381838
let inv_sum = sum.recip();
1839-
for j in 0..n {
1839+
(0..n).for_each(|j| {
18401840
out[j] *= inv_sum;
1841-
}
1841+
});
18421842
}
18431843

18441844
/// Legacy barycentric interpolation method (kept for compatibility)
@@ -2062,19 +2062,19 @@ where
20622062

20632063
let vals = data.values.as_slice().unwrap();
20642064
let mut result = 0.0_f64;
2065-
for i in 0..n_x {
2065+
(0..n_x).for_each(|i| {
20662066
let mut acc_ij = 0.0_f64;
2067-
for j in 0..n_y {
2067+
(0..n_y).for_each(|j| {
20682068
let base = (i * n_y + j) * n_z;
20692069
let row = &vals[base..base + n_z];
20702070
let mut acc_k = 0.0_f64;
20712071
for k in 0..n_z {
20722072
acc_k += cz[k] * row[k];
20732073
}
20742074
acc_ij += cy[j] * acc_k;
2075-
}
2075+
});
20762076
result += cx[i] * acc_ij;
2077-
}
2077+
});
20782078
Ok(result)
20792079
}
20802080

@@ -2176,23 +2176,23 @@ where
21762176

21772177
let vals = data.values.as_slice().unwrap();
21782178
let mut result = 0.0_f64;
2179-
for i in 0..n_x {
2179+
(0..n_x).for_each(|i| {
21802180
let mut a3 = 0.0_f64;
2181-
for j in 0..n_y {
2181+
(0..n_y).for_each(|j| {
21822182
let mut a2 = 0.0_f64;
2183-
for k in 0..n_z {
2183+
(0..n_z).for_each(|k| {
21842184
let base = ((i * n_y + j) * n_z + k) * n_w;
21852185
let row = &vals[base..base + n_w];
21862186
let mut a1 = 0.0_f64;
21872187
for l in 0..n_w {
21882188
a1 += cw[l] * row[l];
21892189
}
21902190
a2 += cz[k] * a1;
2191-
}
2191+
});
21922192
a3 += cy[j] * a2;
2193-
}
2193+
});
21942194
result += cx[i] * a3;
2195-
}
2195+
});
21962196
Ok(result)
21972197
}
21982198

@@ -2310,27 +2310,27 @@ where
23102310

23112311
let vals = data.values.as_slice().unwrap();
23122312
let mut result = 0.0_f64;
2313-
for i in 0..n_x {
2313+
(0..n_x).for_each(|i| {
23142314
let mut a4 = 0.0_f64;
2315-
for j in 0..n_y {
2315+
(0..n_y).for_each(|j| {
23162316
let mut a3 = 0.0_f64;
2317-
for k in 0..n_z {
2317+
(0..n_z).for_each(|k| {
23182318
let mut a2 = 0.0_f64;
2319-
for l in 0..n_w {
2319+
(0..n_w).for_each(|l| {
23202320
let base = (((i * n_y + j) * n_z + k) * n_w + l) * n_v;
23212321
let row = &vals[base..base + n_v];
23222322
let mut a1 = 0.0_f64;
23232323
for m in 0..n_v {
23242324
a1 += cv[m] * row[m];
23252325
}
23262326
a2 += cw[l] * a1;
2327-
}
2327+
});
23282328
a3 += cz[k] * a2;
2329-
}
2329+
});
23302330
a4 += cy[j] * a3;
2331-
}
2331+
});
23322332
result += cx[i] * a4;
2333-
}
2333+
});
23342334
Ok(result)
23352335
}
23362336

0 commit comments

Comments
 (0)