Skip to content

Commit a4b8da2

Browse files
committed
Fix format
1 parent 48dc69c commit a4b8da2

File tree

4 files changed

+28
-10
lines changed

4 files changed

+28
-10
lines changed

rustfmt.toml

-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,5 @@ max_width = 120
22
hard_tabs = false
33
tab_spaces = 4
44
newline_style = "Unix"
5-
wrap_comments = false
6-
normalize_comments = false
75
merge_derives = true
86
force_explicit_abi = true
9-
unstable_features = false

src/generate.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ where
8080
A: LinalgScalar,
8181
S: Data<Elem = A>,
8282
{
83-
let views: Vec<_> = xs.iter()
83+
let views: Vec<_> = xs
84+
.iter()
8485
.map(|x| {
8586
let n = x.len();
8687
x.view().into_shape((n, 1)).unwrap()
@@ -95,7 +96,8 @@ where
9596
A: LinalgScalar,
9697
S: Data<Elem = A>,
9798
{
98-
let views: Vec<_> = xs.iter()
99+
let views: Vec<_> = xs
100+
.iter()
99101
.map(|x| {
100102
let n = x.len();
101103
x.view().into_shape((1, n)).unwrap()

tests/cholesky.rs

+20-4
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,22 @@ fn cholesky() {
1313
println!("a = \n{:?}", a_orig);
1414

1515
let upper = a_orig.cholesky(UPLO::Upper).unwrap();
16-
assert_close_l2!(&upper.t().mapv(|elem| elem.conj()).dot(&upper.view()), &a_orig, $rtol);
16+
assert_close_l2!(
17+
&upper.t().mapv(|elem| elem.conj()).dot(&upper.view()),
18+
&a_orig,
19+
$rtol
20+
);
1721

1822
let lower = a_orig.cholesky(UPLO::Lower).unwrap();
1923
assert_close_l2!(&lower.dot(&lower.t().mapv(|elem| elem.conj())), &a_orig, $rtol);
2024

2125
let a: Array2<$elem> = replicate(&a_orig);
2226
let upper = a.cholesky_into(UPLO::Upper).unwrap();
23-
assert_close_l2!(&upper.t().mapv(|elem| elem.conj()).dot(&upper.view()), &a_orig, $rtol);
27+
assert_close_l2!(
28+
&upper.t().mapv(|elem| elem.conj()).dot(&upper.view()),
29+
&a_orig,
30+
$rtol
31+
);
2432

2533
let a: Array2<$elem> = replicate(&a_orig);
2634
let lower = a.cholesky_into(UPLO::Lower).unwrap();
@@ -29,7 +37,11 @@ fn cholesky() {
2937
let mut a: Array2<$elem> = replicate(&a_orig);
3038
{
3139
let upper = a.cholesky_inplace(UPLO::Upper).unwrap();
32-
assert_close_l2!(&upper.t().mapv(|elem| elem.conj()).dot(&upper.view()), &a_orig, $rtol);
40+
assert_close_l2!(
41+
&upper.t().mapv(|elem| elem.conj()).dot(&upper.view()),
42+
&a_orig,
43+
$rtol
44+
);
3345
}
3446
assert_close_l2!(&a.t().mapv(|elem| elem.conj()).dot(&upper.view()), &a_orig, $rtol);
3547

@@ -103,7 +115,11 @@ fn cholesky_det() {
103115
($elem:ty, $atol:expr) => {
104116
let a: Array2<$elem> = random_hpd(3);
105117
println!("a = \n{:?}", a);
106-
let ln_det = a.eigvalsh(UPLO::Upper).unwrap().mapv(|elem| elem.ln()).scalar_sum();
118+
let ln_det = a
119+
.eigvalsh(UPLO::Upper)
120+
.unwrap()
121+
.mapv(|elem| elem.ln())
122+
.scalar_sum();
107123
let det = ln_det.exp();
108124
assert_aclose!(a.factorizec(UPLO::Upper).unwrap().detc(), det, $atol);
109125
assert_aclose!(a.factorizec(UPLO::Upper).unwrap().ln_detc(), ln_det, $atol);

tests/deth.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ fn deth_empty() {
1515
assert_eq!(a.factorizeh().unwrap().deth(), One::one());
1616
assert_eq!(a.factorizeh().unwrap().sln_deth(), (One::one(), Zero::zero()));
1717
assert_eq!(a.factorizeh().unwrap().deth_into(), One::one());
18-
assert_eq!(a.factorizeh().unwrap().sln_deth_into(), (One::one(), Zero::zero()));
18+
assert_eq!(
19+
a.factorizeh().unwrap().sln_deth_into(),
20+
(One::one(), Zero::zero())
21+
);
1922
assert_eq!(a.deth().unwrap(), One::one());
2023
assert_eq!(a.sln_deth().unwrap(), (One::one(), Zero::zero()));
2124
assert_eq!(a.clone().deth_into().unwrap(), One::one());

0 commit comments

Comments
 (0)