Skip to content

Commit ec37e61

Browse files
committed
STYLE: Apply cargo fmt to files added after PR #96 (JOSS ariostas)
1 parent ef76048 commit ec37e61

8 files changed

Lines changed: 40 additions & 36 deletions

File tree

examples/clippy_verify.rs

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,7 @@ fn check_integral() {
6161
let f = |x: f64| x.cos() + 0.25 * x * x;
6262
for &n in &[15_usize, 21, 31, 41, 51, 61] {
6363
let r: f64 = kronrod_quadrature(f, n, (0.0, 1.7));
64-
print_kv(
65-
&format!("kronrod_quadrature n={}", n),
66-
format!("{r:.17e}"),
67-
);
64+
print_kv(&format!("kronrod_quadrature n={}", n), format!("{r:.17e}"));
6865
// also exercise with a different smooth integrand to widen coverage
6966
let r2: f64 = kronrod_quadrature(|x: f64| (-x * x).exp(), n, (-2.5, 1.5));
7067
print_kv(
@@ -78,17 +75,17 @@ fn check_chebyshev_lagrange() {
7875
// chebyshev_nodes carries one of the affected loops directly.
7976
for &n in &[4_usize, 8, 16, 32] {
8077
let nodes = chebyshev_nodes(n, -2.0, 3.5);
81-
print_kv(
82-
&format!("chebyshev_nodes(n={n}) hash"),
83-
hash_f64s(&nodes),
84-
);
78+
print_kv(&format!("chebyshev_nodes(n={n}) hash"), hash_f64s(&nodes));
8579
}
8680
// lagrange_polynomial uses divided-difference loops touched by clippy.
8781
let xs = vec![0.0_f64, 0.5, 1.1, 1.7, 2.4, 3.0];
8882
let ys: Vec<f64> = xs.iter().map(|x| x.sin() + 0.5 * x).collect();
8983
let p = lagrange_polynomial(xs.clone(), ys.clone());
9084
for &q in &[0.1_f64, 0.7, 1.3, 1.9, 2.5] {
91-
print_kv(&format!("lagrange.eval({q})"), format!("{:.17e}", p.eval(q)));
85+
print_kv(
86+
&format!("lagrange.eval({q})"),
87+
format!("{:.17e}", p.eval(q)),
88+
);
9289
}
9390
print_kv(
9491
"lagrange.derivative coeffs",
@@ -212,10 +209,7 @@ fn check_polynomial() {
212209
print_kv("poly.derivative", hash_f64s(&p.derivative().coef));
213210
print_kv("poly.integral", hash_f64s(&p.integral().coef));
214211
for &x in &[-1.0_f64, -0.25, 0.0, 0.5, 1.5, 2.7] {
215-
print_kv(
216-
&format!("poly.eval({x})"),
217-
format!("{:.17e}", p.eval(x)),
218-
);
212+
print_kv(&format!("poly.eval({x})"), format!("{:.17e}", p.eval(x)));
219213
}
220214
}
221215

src/numerical/eigen.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ impl JacobiTemp {
101101
}
102102
if sm == 0f64 {
103103
eigsrt(d, v);
104-
return ;
104+
return;
105105
}
106106
let tresh = if i < 4 {
107107
0.2 * sm / (n.pow(2) as f64)

src/numerical/optimize.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,6 @@ where
308308
break;
309309
}
310310

311-
312-
313311
let b_lu = (jtj.clone() + lambda * jtj.to_diag()).lu();
314312
if b_lu.det() == 0f64 {
315313
break;

src/structure/matrix.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3569,7 +3569,7 @@ impl LinearAlgebra<Matrix> for Matrix {
35693569
Some(obj) => obj,
35703570
};
35713571
let x = &wazd.w.t() * &b.to_vec();
3572-
3572+
35733573
&wazd.z * &x
35743574
}
35753575
}
@@ -3616,7 +3616,7 @@ impl LinearAlgebra<Matrix> for Matrix {
36163616
Some(obj) => obj,
36173617
};
36183618
let x = &wazd.w.t() * m;
3619-
3619+
36203620
&wazd.z * &x
36213621
}
36223622
}

src/structure/vector.rs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -981,16 +981,13 @@ impl ParallelVectorProduct for Vec<f64> {
981981
v[0] = self[0] * other[1] - self[1] * other[0];
982982
v
983983
}
984-
3 => {
985-
986-
(0..3)
987-
.into_par_iter()
988-
.map(|index| {
989-
self[(index + 1) % 3] * other[(index + 2) % 3]
990-
- self[(index + 2) % 3] * other[(index + 1) % 3]
991-
})
992-
.collect::<Vec<f64>>()
993-
}
984+
3 => (0..3)
985+
.into_par_iter()
986+
.map(|index| {
987+
self[(index + 1) % 3] * other[(index + 2) % 3]
988+
- self[(index + 2) % 3] * other[(index + 1) % 3]
989+
})
990+
.collect::<Vec<f64>>(),
994991
_ => {
995992
panic!("Cross product can be defined only in 2 or 3 dimension")
996993
}

tests/blas_test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
extern crate peroxide;
2-
#[allow(unused_imports)]
3-
use peroxide::fuga::*;
42
#[cfg(feature = "O3")]
53
use peroxide::c;
4+
#[allow(unused_imports)]
5+
use peroxide::fuga::*;
66

77
#[test]
88
#[cfg(feature = "O3")]

tests/integral.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ fn assert_close(actual: f64, expected: f64) {
88
assert!(
99
(actual - expected).abs() < TOL,
1010
"actual = {:.17e}, expected = {:.17e}, diff = {:.3e}",
11-
actual, expected, (actual - expected).abs()
11+
actual,
12+
expected,
13+
(actual - expected).abs()
1214
);
1315
}
1416

tests/optimize.rs

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,23 @@ const P_TRUE: [f64; 3] = [1.0, 2.0, 3.0];
66
// y = p[0] * t^2 + p[1] * t + p[2]
77
#[allow(clippy::ptr_arg)]
88
fn quadratic(x: &Vec<f64>, p: Vec<AD>) -> Option<Vec<AD>> {
9-
Some(x.iter().map(|t| AD1(*t, 0f64)).map(|t| p[0] * t.powi(2) + p[1] * t + p[2]).collect())
9+
Some(
10+
x.iter()
11+
.map(|t| AD1(*t, 0f64))
12+
.map(|t| p[0] * t.powi(2) + p[1] * t + p[2])
13+
.collect(),
14+
)
1015
}
1116

1217
// y = p[0] * exp(p[1] * t)
1318
#[allow(clippy::ptr_arg)]
1419
fn exp_decay(x: &Vec<f64>, p: Vec<AD>) -> Option<Vec<AD>> {
15-
Some(x.iter().map(|t| AD1(*t, 0f64)).map(|t| p[0] * (p[1] * t).exp()).collect())
20+
Some(
21+
x.iter()
22+
.map(|t| AD1(*t, 0f64))
23+
.map(|t| p[0] * (p[1] * t).exp())
24+
.collect(),
25+
)
1626
}
1727

1828
#[test]
@@ -23,7 +33,8 @@ fn test_LM_quadratic_recovers_parameters() {
2333
let data = hstack!(x, y);
2434

2535
let mut opt = Optimizer::new(data, quadratic);
26-
let p = opt.set_init_param(vec![1f64, 1f64, 1f64])
36+
let p = opt
37+
.set_init_param(vec![1f64, 1f64, 1f64])
2738
.set_max_iter(50)
2839
.set_method(LevenbergMarquardt)
2940
.set_lambda_init(1e-3)
@@ -44,7 +55,8 @@ fn test_GD_quadratic_makes_progress() {
4455
let p_init = [1f64, 1f64, 1f64];
4556

4657
let mut opt = Optimizer::new(data, quadratic);
47-
let p = opt.set_init_param(p_init.to_vec())
58+
let p = opt
59+
.set_init_param(p_init.to_vec())
4860
.set_max_iter(1000)
4961
.set_method(GradientDescent)
5062
.set_lr(1e-6)
@@ -68,7 +80,8 @@ fn test_LM_exponential_recovers_parameters() {
6880
let data = hstack!(x, y);
6981

7082
let mut opt = Optimizer::new(data, exp_decay);
71-
let p = opt.set_init_param(vec![1.0_f64, -0.1_f64])
83+
let p = opt
84+
.set_init_param(vec![1.0_f64, -0.1_f64])
7285
.set_max_iter(100)
7386
.set_method(LevenbergMarquardt)
7487
.set_lambda_init(1e-3)

0 commit comments

Comments
 (0)