Skip to content

Commit d8e6d20

Browse files
0e4ef6220e4ef622
committed
Fix clippy lints
1 parent a9e3eb7 commit d8e6d20

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+316
-316
lines changed

‎crates/argmin-math/ndarray-tests-src/add.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ mod tests {
2525
let target = array![35 as $t, 38 as $t, 42 as $t];
2626
let res = <Array1<$t> as ArgminAdd<$t, Array1<$t>>>::add(&a, &b);
2727
for i in 0..3 {
28-
assert_relative_eq!(target[i] as f64, res[i] as f64, epsilon = std::f64::EPSILON);
28+
assert_relative_eq!(target[i] as f64, res[i] as f64, epsilon = f64::EPSILON);
2929
}
3030
}
3131
}
@@ -38,7 +38,7 @@ mod tests {
3838
let target = array![35 as $t, 38 as $t, 42 as $t];
3939
let res = <$t as ArgminAdd<Array1<$t>, Array1<$t>>>::add(&b, &a);
4040
for i in 0..3 {
41-
assert_relative_eq!(target[i] as f64, res[i] as f64, epsilon = std::f64::EPSILON);
41+
assert_relative_eq!(target[i] as f64, res[i] as f64, epsilon = f64::EPSILON);
4242
}
4343
}
4444
}
@@ -51,7 +51,7 @@ mod tests {
5151
let target = array![42 as $t, 42 as $t, 42 as $t];
5252
let res = <Array1<$t> as ArgminAdd<Array1<$t>, Array1<$t>>>::add(&a, &b);
5353
for i in 0..3 {
54-
assert_relative_eq!(target[i] as f64, res[i] as f64, epsilon = std::f64::EPSILON);
54+
assert_relative_eq!(target[i] as f64, res[i] as f64, epsilon = f64::EPSILON);
5555
}
5656
}
5757
}
@@ -104,7 +104,7 @@ mod tests {
104104
let res = <Array2<$t> as ArgminAdd<Array2<$t>, Array2<$t>>>::add(&a, &b);
105105
for i in 0..3 {
106106
for j in 0..2 {
107-
assert_relative_eq!(target[(j, i)] as f64, res[(j, i)] as f64, epsilon = std::f64::EPSILON);
107+
assert_relative_eq!(target[(j, i)] as f64, res[(j, i)] as f64, epsilon = f64::EPSILON);
108108
}
109109
}
110110
}
@@ -125,7 +125,7 @@ mod tests {
125125
let res = <Array2<$t> as ArgminAdd<$t, Array2<$t>>>::add(&a, &b);
126126
for i in 0..3 {
127127
for j in 0..2 {
128-
assert_relative_eq!(target[(j, i)] as f64, res[(j, i)] as f64, epsilon = std::f64::EPSILON);
128+
assert_relative_eq!(target[(j, i)] as f64, res[(j, i)] as f64, epsilon = f64::EPSILON);
129129
}
130130
}
131131
}

‎crates/argmin-math/ndarray-tests-src/conj.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ mod tests {
3535
for i in 0..3 {
3636
let tmp = b[i] - res[i];
3737
let norm = ((tmp.re * tmp.re + tmp.im * tmp.im) as f64).sqrt();
38-
assert!(norm < std::f64::EPSILON);
38+
assert!(norm < f64::EPSILON);
3939
}
4040
}
4141
}
@@ -56,8 +56,8 @@ mod tests {
5656
let res = <Array2<Complex<$t>> as ArgminConj>::conj(&a);
5757
for i in 0..2 {
5858
for j in 0..3 {
59-
assert_relative_eq!(b[(j, i)].re as f64, res[(j, i)].re as f64, epsilon = std::f64::EPSILON);
60-
assert_relative_eq!(b[(j, i)].im as f64, res[(j, i)].im as f64, epsilon = std::f64::EPSILON);
59+
assert_relative_eq!(b[(j, i)].re as f64, res[(j, i)].re as f64, epsilon = f64::EPSILON);
60+
assert_relative_eq!(b[(j, i)].im as f64, res[(j, i)].im as f64, epsilon = f64::EPSILON);
6161
}
6262
}
6363
}
@@ -69,7 +69,7 @@ mod tests {
6969
let a = Array1::from(vec![1 as $t, 4 as $t, 8 as $t]);
7070
let res = <Array1<$t> as ArgminConj>::conj(&a);
7171
for i in 0..3 {
72-
assert_relative_eq!(a[i] as f64, res[i] as f64, epsilon = std::f64::EPSILON);
72+
assert_relative_eq!(a[i] as f64, res[i] as f64, epsilon = f64::EPSILON);
7373
}
7474
}
7575
}
@@ -84,7 +84,7 @@ mod tests {
8484
let res = <Array2<$t> as ArgminConj>::conj(&a);
8585
for i in 0..3 {
8686
for j in 0..2 {
87-
assert_relative_eq!(a[(j, i)] as f64, res[(j, i)] as f64, epsilon = std::f64::EPSILON);
87+
assert_relative_eq!(a[(j, i)] as f64, res[(j, i)] as f64, epsilon = f64::EPSILON);
8888
}
8989
}
9090
}

‎crates/argmin-math/ndarray-tests-src/div.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ mod tests {
2525
let target = array![2 as $t, 8 as $t, 4 as $t];
2626
let res = <Array1<$t> as ArgminDiv<$t, Array1<$t>>>::div(&a, &b);
2727
for i in 0..3 {
28-
assert_relative_eq!(target[i] as f64, res[i] as f64, epsilon = std::f64::EPSILON);
28+
assert_relative_eq!(target[i] as f64, res[i] as f64, epsilon = f64::EPSILON);
2929
}
3030
}
3131
}
@@ -38,7 +38,7 @@ mod tests {
3838
let target = array![16 as $t, 8 as $t, 4 as $t];
3939
let res = <$t as ArgminDiv<Array1<$t>, Array1<$t>>>::div(&b, &a);
4040
for i in 0..3 {
41-
assert_relative_eq!(target[i] as f64, res[i] as f64, epsilon = std::f64::EPSILON);
41+
assert_relative_eq!(target[i] as f64, res[i] as f64, epsilon = f64::EPSILON);
4242
}
4343
}
4444
}
@@ -51,7 +51,7 @@ mod tests {
5151
let target = array![2 as $t, 3 as $t, 2 as $t];
5252
let res = <Array1<$t> as ArgminDiv<Array1<$t>, Array1<$t>>>::div(&a, &b);
5353
for i in 0..3 {
54-
assert_relative_eq!(target[i] as f64, res[i] as f64, epsilon = std::f64::EPSILON);
54+
assert_relative_eq!(target[i] as f64, res[i] as f64, epsilon = f64::EPSILON);
5555
}
5656
}
5757
}
@@ -104,7 +104,7 @@ mod tests {
104104
let res = <Array2<$t> as ArgminDiv<Array2<$t>, Array2<$t>>>::div(&a, &b);
105105
for i in 0..3 {
106106
for j in 0..2 {
107-
assert_relative_eq!(target[(j, i)] as f64, res[(j, i)] as f64, epsilon = std::f64::EPSILON);
107+
assert_relative_eq!(target[(j, i)] as f64, res[(j, i)] as f64, epsilon = f64::EPSILON);
108108
}
109109
}
110110
}

‎crates/argmin-math/ndarray-tests-src/dot.rs

+24-24
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ mod tests {
2424
let a = array![1 as $t, 2 as $t, 3 as $t];
2525
let b = array![4 as $t, 5 as $t, 6 as $t];
2626
let res: $t = <Array1<$t> as ArgminDot<Array1<$t>, $t>>::dot(&a, &b);
27-
assert_relative_eq!(res as f64, 32 as f64, epsilon = std::f64::EPSILON);
27+
assert_relative_eq!(res as f64, 32 as f64, epsilon = f64::EPSILON);
2828
}
2929
}
3030

@@ -37,7 +37,7 @@ mod tests {
3737
<Array1<$t> as ArgminDot<$t, Array1<$t>>>::dot(&a, &b);
3838
let res = array![2 as $t, 4 as $t, 6 as $t];
3939
for i in 0..3 {
40-
assert_relative_eq!(res[i] as f64, product[i] as f64, epsilon = std::f64::EPSILON);
40+
assert_relative_eq!(res[i] as f64, product[i] as f64, epsilon = f64::EPSILON);
4141
}
4242
}
4343
}
@@ -51,7 +51,7 @@ mod tests {
5151
<$t as ArgminDot<Array1<$t>, Array1<$t>>>::dot(&b, &a);
5252
let res = array![2 as $t, 4 as $t, 6 as $t];
5353
for i in 0..3 {
54-
assert_relative_eq!(res[i] as f64, product[i] as f64, epsilon = std::f64::EPSILON);
54+
assert_relative_eq!(res[i] as f64, product[i] as f64, epsilon = f64::EPSILON);
5555
}
5656
}
5757
}
@@ -70,7 +70,7 @@ mod tests {
7070
<Array1<$t> as ArgminDot<Array1<$t>, Array2<$t>>>::dot(&a, &b);
7171
for i in 0..3 {
7272
for j in 0..3 {
73-
assert_relative_eq!(res[(i, j)] as f64, product[(i, j)] as f64, epsilon = std::f64::EPSILON);
73+
assert_relative_eq!(res[(i, j)] as f64, product[(i, j)] as f64, epsilon = f64::EPSILON);
7474
}
7575
}
7676
}
@@ -89,7 +89,7 @@ mod tests {
8989
let product: Array1<$t> =
9090
<Array2<$t> as ArgminDot<Array1<$t>, Array1<$t>>>::dot(&a, &b);
9191
for i in 0..3 {
92-
assert_relative_eq!(res[i] as f64, product[i] as f64, epsilon = std::f64::EPSILON);
92+
assert_relative_eq!(res[i] as f64, product[i] as f64, epsilon = f64::EPSILON);
9393
}
9494
}
9595
}
@@ -116,7 +116,7 @@ mod tests {
116116
<Array2<$t> as ArgminDot<Array2<$t>, Array2<$t>>>::dot(&a, &b);
117117
for i in 0..3 {
118118
for j in 0..3 {
119-
assert_relative_eq!(res[(i, j)] as f64, product[(i, j)] as f64, epsilon = std::f64::EPSILON);
119+
assert_relative_eq!(res[(i, j)] as f64, product[(i, j)] as f64, epsilon = f64::EPSILON);
120120
}
121121
}
122122
}
@@ -139,7 +139,7 @@ mod tests {
139139
<Array2<$t> as ArgminDot<$t, Array2<$t>>>::dot(&a, &(2 as $t));
140140
for i in 0..3 {
141141
for j in 0..3 {
142-
assert_relative_eq!(res[(i, j)] as f64, product[(i, j)] as f64, epsilon = std::f64::EPSILON);
142+
assert_relative_eq!(res[(i, j)] as f64, product[(i, j)] as f64, epsilon = f64::EPSILON);
143143
}
144144
}
145145
}
@@ -162,7 +162,7 @@ mod tests {
162162
<$t as ArgminDot<Array2<$t>, Array2<$t>>>::dot(&(2 as $t), &a);
163163
for i in 0..3 {
164164
for j in 0..3 {
165-
assert_relative_eq!(res[(i, j)] as f64, product[(i, j)] as f64, epsilon = std::f64::EPSILON);
165+
assert_relative_eq!(res[(i, j)] as f64, product[(i, j)] as f64, epsilon = f64::EPSILON);
166166
}
167167
}
168168
}
@@ -183,8 +183,8 @@ mod tests {
183183
];
184184
let res: Complex<$t> = <Array1<Complex<$t>> as ArgminDot<Array1<Complex<$t>>, Complex<$t>>>::dot(&a, &b);
185185
let target = a[0]*b[0] + a[1]*b[1] + a[2]*b[2];
186-
assert_relative_eq!(res.re as f64, target.re as f64, epsilon = std::f64::EPSILON);
187-
assert_relative_eq!(res.im as f64, target.im as f64, epsilon = std::f64::EPSILON);
186+
assert_relative_eq!(res.re as f64, target.re as f64, epsilon = f64::EPSILON);
187+
assert_relative_eq!(res.im as f64, target.im as f64, epsilon = f64::EPSILON);
188188
}
189189
}
190190

@@ -201,8 +201,8 @@ mod tests {
201201
<Array1<Complex<$t>> as ArgminDot<Complex<$t>, Array1<Complex<$t>>>>::dot(&a, &b);
202202
let res = array![a[0]*b, a[1]*b, a[2]*b];
203203
for i in 0..3 {
204-
assert_relative_eq!(res[i].re as f64, product[i].re as f64, epsilon = std::f64::EPSILON);
205-
assert_relative_eq!(res[i].im as f64, product[i].im as f64, epsilon = std::f64::EPSILON);
204+
assert_relative_eq!(res[i].re as f64, product[i].re as f64, epsilon = f64::EPSILON);
205+
assert_relative_eq!(res[i].im as f64, product[i].im as f64, epsilon = f64::EPSILON);
206206
}
207207
}
208208
}
@@ -220,8 +220,8 @@ mod tests {
220220
<Complex<$t> as ArgminDot<Array1<Complex<$t>>, Array1<Complex<$t>>>>::dot(&b, &a);
221221
let res = array![a[0]*b, a[1]*b, a[2]*b];
222222
for i in 0..3 {
223-
assert_relative_eq!(res[i].re as f64, product[i].re as f64, epsilon = std::f64::EPSILON);
224-
assert_relative_eq!(res[i].im as f64, product[i].im as f64, epsilon = std::f64::EPSILON);
223+
assert_relative_eq!(res[i].re as f64, product[i].re as f64, epsilon = f64::EPSILON);
224+
assert_relative_eq!(res[i].im as f64, product[i].im as f64, epsilon = f64::EPSILON);
225225
}
226226
}
227227
}
@@ -245,8 +245,8 @@ mod tests {
245245
<Array1<Complex<$t>> as ArgminDot<Array1<Complex<$t>>, Array2<Complex<$t>>>>::dot(&a, &b);
246246
for i in 0..2 {
247247
for j in 0..2 {
248-
assert_relative_eq!(res[(i, j)].re as f64, product[(i, j)].re as f64, epsilon = std::f64::EPSILON);
249-
assert_relative_eq!(res[(i, j)].im as f64, product[(i, j)].im as f64, epsilon = std::f64::EPSILON);
248+
assert_relative_eq!(res[(i, j)].re as f64, product[(i, j)].re as f64, epsilon = f64::EPSILON);
249+
assert_relative_eq!(res[(i, j)].im as f64, product[(i, j)].im as f64, epsilon = f64::EPSILON);
250250
}
251251
}
252252
}
@@ -270,8 +270,8 @@ mod tests {
270270
let product: Array1<Complex<$t>> =
271271
<Array2<Complex<$t>> as ArgminDot<Array1<Complex<$t>>, Array1<Complex<$t>>>>::dot(&a, &b);
272272
for i in 0..2 {
273-
assert_relative_eq!(res[i].re as f64, product[i].re as f64, epsilon = std::f64::EPSILON);
274-
assert_relative_eq!(res[i].im as f64, product[i].im as f64, epsilon = std::f64::EPSILON);
273+
assert_relative_eq!(res[i].re as f64, product[i].re as f64, epsilon = f64::EPSILON);
274+
assert_relative_eq!(res[i].im as f64, product[i].im as f64, epsilon = f64::EPSILON);
275275
}
276276
}
277277
}
@@ -301,8 +301,8 @@ mod tests {
301301
<Array2<Complex<$t>> as ArgminDot<Array2<Complex<$t>>, Array2<Complex<$t>>>>::dot(&a, &b);
302302
for i in 0..2 {
303303
for j in 0..2 {
304-
assert_relative_eq!(res[(i, j)].re as f64, product[(i, j)].re as f64, epsilon = std::f64::EPSILON);
305-
assert_relative_eq!(res[(i, j)].im as f64, product[(i, j)].im as f64, epsilon = std::f64::EPSILON);
304+
assert_relative_eq!(res[(i, j)].re as f64, product[(i, j)].re as f64, epsilon = f64::EPSILON);
305+
assert_relative_eq!(res[(i, j)].im as f64, product[(i, j)].im as f64, epsilon = f64::EPSILON);
306306
}
307307
}
308308
}
@@ -324,8 +324,8 @@ mod tests {
324324
<Array2<Complex<$t>> as ArgminDot<Complex<$t>, Array2<Complex<$t>>>>::dot(&a, &b);
325325
for i in 0..2 {
326326
for j in 0..2 {
327-
assert_relative_eq!(res[(i, j)].re as f64, product[(i, j)].re as f64, epsilon = std::f64::EPSILON);
328-
assert_relative_eq!(res[(i, j)].im as f64, product[(i, j)].im as f64, epsilon = std::f64::EPSILON);
327+
assert_relative_eq!(res[(i, j)].re as f64, product[(i, j)].re as f64, epsilon = f64::EPSILON);
328+
assert_relative_eq!(res[(i, j)].im as f64, product[(i, j)].im as f64, epsilon = f64::EPSILON);
329329
}
330330
}
331331
}
@@ -347,8 +347,8 @@ mod tests {
347347
<Complex<$t> as ArgminDot<Array2<Complex<$t>>, Array2<Complex<$t>>>>::dot(&b, &a);
348348
for i in 0..2 {
349349
for j in 0..2 {
350-
assert_relative_eq!(res[(i, j)].re as f64, product[(i, j)].re as f64, epsilon = std::f64::EPSILON);
351-
assert_relative_eq!(res[(i, j)].im as f64, product[(i, j)].im as f64, epsilon = std::f64::EPSILON);
350+
assert_relative_eq!(res[(i, j)].re as f64, product[(i, j)].re as f64, epsilon = f64::EPSILON);
351+
assert_relative_eq!(res[(i, j)].im as f64, product[(i, j)].im as f64, epsilon = f64::EPSILON);
352352
}
353353
}
354354
}

‎crates/argmin-math/ndarray-tests-src/eye.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ mod tests {
2828
];
2929
for i in 0..3 {
3030
for j in 0..3 {
31-
assert_relative_eq!(res[(i, j)] as f64, e[(i, j)] as f64, epsilon = std::f64::EPSILON);
31+
assert_relative_eq!(res[(i, j)] as f64, e[(i, j)] as f64, epsilon = f64::EPSILON);
3232
}
3333
}
3434
}
@@ -50,7 +50,7 @@ mod tests {
5050
];
5151
for i in 0..3 {
5252
for j in 0..3 {
53-
assert_relative_eq!(res[(i, j)] as f64, e[(i, j)] as f64, epsilon = std::f64::EPSILON);
53+
assert_relative_eq!(res[(i, j)] as f64, e[(i, j)] as f64, epsilon = f64::EPSILON);
5454
}
5555
}
5656
}

‎crates/argmin-math/ndarray-tests-src/inv.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ mod tests {
3131
let res = <Array2<$t> as ArgminInv<Array2<$t>>>::inv(&a).unwrap();
3232
for i in 0..2 {
3333
for j in 0..2 {
34-
assert_relative_eq!(res[(i, j)], target[(i, j)], epsilon = std::$t::EPSILON.sqrt());
34+
assert_relative_eq!(res[(i, j)], target[(i, j)], epsilon = $t::EPSILON.sqrt());
3535
}
3636
}
3737
}
@@ -43,7 +43,7 @@ mod tests {
4343
let a = 2.0;
4444
let target = 0.5;
4545
let res = <$t as ArgminInv<$t>>::inv(&a).unwrap();
46-
assert_relative_eq!(res as f64, target as f64, epsilon = std::f64::EPSILON);
46+
assert_relative_eq!(res as f64, target as f64, epsilon = f64::EPSILON);
4747
}
4848
}
4949
};

‎crates/argmin-math/ndarray-tests-src/l1norm.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ mod tests {
2323
let a = array![4 as $t, 3 as $t];
2424
let res = <Array1<$t> as ArgminL1Norm<$t>>::l1_norm(&a);
2525
let target = 7 as $t;
26-
assert_relative_eq!(target as f64, res as f64, epsilon = std::f64::EPSILON);
26+
assert_relative_eq!(target as f64, res as f64, epsilon = f64::EPSILON);
2727
}
2828
}
2929

@@ -33,7 +33,7 @@ mod tests {
3333
let a = array![Complex::new(4 as $t, 2 as $t), Complex::new(3 as $t, 4 as $t)];
3434
let res = <Array1<Complex<$t>> as ArgminL1Norm<$t>>::l1_norm(&a);
3535
let target = a[0].l1_norm() + a[1].l1_norm();
36-
assert_relative_eq!(target as f64, res as f64, epsilon = std::f64::EPSILON);
36+
assert_relative_eq!(target as f64, res as f64, epsilon = f64::EPSILON);
3737
}
3838
}
3939
};
@@ -47,7 +47,7 @@ mod tests {
4747
let a = array![-4 as $t, -3 as $t];
4848
let res = <Array1<$t> as ArgminL1Norm<$t>>::l1_norm(&a);
4949
let target = 7 as $t;
50-
assert_relative_eq!(target as f64, res as f64, epsilon = std::f64::EPSILON);
50+
assert_relative_eq!(target as f64, res as f64, epsilon = f64::EPSILON);
5151
}
5252
}
5353

@@ -57,7 +57,7 @@ mod tests {
5757
let a = array![Complex::new(-4 as $t, -2 as $t), Complex::new(-3 as $t, -4 as $t)];
5858
let res = <Array1<Complex<$t>> as ArgminL1Norm<$t>>::l1_norm(&a);
5959
let target = a[0].l1_norm() + a[1].l1_norm();
60-
assert_relative_eq!(target as f64, res as f64, epsilon = std::f64::EPSILON);
60+
assert_relative_eq!(target as f64, res as f64, epsilon = f64::EPSILON);
6161
}
6262
}
6363
};

0 commit comments

Comments
 (0)