Skip to content

Commit a51161b

Browse files
DJMcNabDJMcNab
committed
Fix f32 tests as well
1 parent 2d4011e commit a51161b

File tree

1 file changed

+71
-71
lines changed
  • library/coretests/tests/floats

1 file changed

+71
-71
lines changed

‎library/coretests/tests/floats/f32.rs

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -215,88 +215,88 @@ fn test_classify() {
215215

216216
#[test]
217217
fn test_floor() {
218-
assert_approx_eq!(f32::floor(1.0f32), 1.0f32);
219-
assert_approx_eq!(f32::floor(1.3f32), 1.0f32);
220-
assert_approx_eq!(f32::floor(1.5f32), 1.0f32);
221-
assert_approx_eq!(f32::floor(1.7f32), 1.0f32);
222-
assert_approx_eq!(f32::floor(0.0f32), 0.0f32);
223-
assert_approx_eq!(f32::floor(-0.0f32), -0.0f32);
224-
assert_approx_eq!(f32::floor(-1.0f32), -1.0f32);
225-
assert_approx_eq!(f32::floor(-1.3f32), -2.0f32);
226-
assert_approx_eq!(f32::floor(-1.5f32), -2.0f32);
227-
assert_approx_eq!(f32::floor(-1.7f32), -2.0f32);
218+
assert_approx_eq!(f32::math::floor(1.0f32), 1.0f32);
219+
assert_approx_eq!(f32::math::floor(1.3f32), 1.0f32);
220+
assert_approx_eq!(f32::math::floor(1.5f32), 1.0f32);
221+
assert_approx_eq!(f32::math::floor(1.7f32), 1.0f32);
222+
assert_approx_eq!(f32::math::floor(0.0f32), 0.0f32);
223+
assert_approx_eq!(f32::math::floor(-0.0f32), -0.0f32);
224+
assert_approx_eq!(f32::math::floor(-1.0f32), -1.0f32);
225+
assert_approx_eq!(f32::math::floor(-1.3f32), -2.0f32);
226+
assert_approx_eq!(f32::math::floor(-1.5f32), -2.0f32);
227+
assert_approx_eq!(f32::math::floor(-1.7f32), -2.0f32);
228228
}
229229

230230
#[test]
231231
fn test_ceil() {
232-
assert_approx_eq!(f32::ceil(1.0f32), 1.0f32);
233-
assert_approx_eq!(f32::ceil(1.3f32), 2.0f32);
234-
assert_approx_eq!(f32::ceil(1.5f32), 2.0f32);
235-
assert_approx_eq!(f32::ceil(1.7f32), 2.0f32);
236-
assert_approx_eq!(f32::ceil(0.0f32), 0.0f32);
237-
assert_approx_eq!(f32::ceil(-0.0f32), -0.0f32);
238-
assert_approx_eq!(f32::ceil(-1.0f32), -1.0f32);
239-
assert_approx_eq!(f32::ceil(-1.3f32), -1.0f32);
240-
assert_approx_eq!(f32::ceil(-1.5f32), -1.0f32);
241-
assert_approx_eq!(f32::ceil(-1.7f32), -1.0f32);
232+
assert_approx_eq!(f32::math::ceil(1.0f32), 1.0f32);
233+
assert_approx_eq!(f32::math::ceil(1.3f32), 2.0f32);
234+
assert_approx_eq!(f32::math::ceil(1.5f32), 2.0f32);
235+
assert_approx_eq!(f32::math::ceil(1.7f32), 2.0f32);
236+
assert_approx_eq!(f32::math::ceil(0.0f32), 0.0f32);
237+
assert_approx_eq!(f32::math::ceil(-0.0f32), -0.0f32);
238+
assert_approx_eq!(f32::math::ceil(-1.0f32), -1.0f32);
239+
assert_approx_eq!(f32::math::ceil(-1.3f32), -1.0f32);
240+
assert_approx_eq!(f32::math::ceil(-1.5f32), -1.0f32);
241+
assert_approx_eq!(f32::math::ceil(-1.7f32), -1.0f32);
242242
}
243243

244244
#[test]
245245
fn test_round() {
246-
assert_approx_eq!(f32::round(2.5f32), 3.0f32);
247-
assert_approx_eq!(f32::round(1.0f32), 1.0f32);
248-
assert_approx_eq!(f32::round(1.3f32), 1.0f32);
249-
assert_approx_eq!(f32::round(1.5f32), 2.0f32);
250-
assert_approx_eq!(f32::round(1.7f32), 2.0f32);
251-
assert_approx_eq!(f32::round(0.0f32), 0.0f32);
252-
assert_approx_eq!(f32::round(-0.0f32), -0.0f32);
253-
assert_approx_eq!(f32::round(-1.0f32), -1.0f32);
254-
assert_approx_eq!(f32::round(-1.3f32), -1.0f32);
255-
assert_approx_eq!(f32::round(-1.5f32), -2.0f32);
256-
assert_approx_eq!(f32::round(-1.7f32), -2.0f32);
246+
assert_approx_eq!(f32::math::round(2.5f32), 3.0f32);
247+
assert_approx_eq!(f32::math::round(1.0f32), 1.0f32);
248+
assert_approx_eq!(f32::math::round(1.3f32), 1.0f32);
249+
assert_approx_eq!(f32::math::round(1.5f32), 2.0f32);
250+
assert_approx_eq!(f32::math::round(1.7f32), 2.0f32);
251+
assert_approx_eq!(f32::math::round(0.0f32), 0.0f32);
252+
assert_approx_eq!(f32::math::round(-0.0f32), -0.0f32);
253+
assert_approx_eq!(f32::math::round(-1.0f32), -1.0f32);
254+
assert_approx_eq!(f32::math::round(-1.3f32), -1.0f32);
255+
assert_approx_eq!(f32::math::round(-1.5f32), -2.0f32);
256+
assert_approx_eq!(f32::math::round(-1.7f32), -2.0f32);
257257
}
258258

259259
#[test]
260260
fn test_round_ties_even() {
261-
assert_approx_eq!(f32::round_ties_even(2.5f32), 2.0f32);
262-
assert_approx_eq!(f32::round_ties_even(1.0f32), 1.0f32);
263-
assert_approx_eq!(f32::round_ties_even(1.3f32), 1.0f32);
264-
assert_approx_eq!(f32::round_ties_even(1.5f32), 2.0f32);
265-
assert_approx_eq!(f32::round_ties_even(1.7f32), 2.0f32);
266-
assert_approx_eq!(f32::round_ties_even(0.0f32), 0.0f32);
267-
assert_approx_eq!(f32::round_ties_even(-0.0f32), -0.0f32);
268-
assert_approx_eq!(f32::round_ties_even(-1.0f32), -1.0f32);
269-
assert_approx_eq!(f32::round_ties_even(-1.3f32), -1.0f32);
270-
assert_approx_eq!(f32::round_ties_even(-1.5f32), -2.0f32);
271-
assert_approx_eq!(f32::round_ties_even(-1.7f32), -2.0f32);
261+
assert_approx_eq!(f32::math::round_ties_even(2.5f32), 2.0f32);
262+
assert_approx_eq!(f32::math::round_ties_even(1.0f32), 1.0f32);
263+
assert_approx_eq!(f32::math::round_ties_even(1.3f32), 1.0f32);
264+
assert_approx_eq!(f32::math::round_ties_even(1.5f32), 2.0f32);
265+
assert_approx_eq!(f32::math::round_ties_even(1.7f32), 2.0f32);
266+
assert_approx_eq!(f32::math::round_ties_even(0.0f32), 0.0f32);
267+
assert_approx_eq!(f32::math::round_ties_even(-0.0f32), -0.0f32);
268+
assert_approx_eq!(f32::math::round_ties_even(-1.0f32), -1.0f32);
269+
assert_approx_eq!(f32::math::round_ties_even(-1.3f32), -1.0f32);
270+
assert_approx_eq!(f32::math::round_ties_even(-1.5f32), -2.0f32);
271+
assert_approx_eq!(f32::math::round_ties_even(-1.7f32), -2.0f32);
272272
}
273273

274274
#[test]
275275
fn test_trunc() {
276-
assert_approx_eq!(f32::trunc(1.0f32), 1.0f32);
277-
assert_approx_eq!(f32::trunc(1.3f32), 1.0f32);
278-
assert_approx_eq!(f32::trunc(1.5f32), 1.0f32);
279-
assert_approx_eq!(f32::trunc(1.7f32), 1.0f32);
280-
assert_approx_eq!(f32::trunc(0.0f32), 0.0f32);
281-
assert_approx_eq!(f32::trunc(-0.0f32), -0.0f32);
282-
assert_approx_eq!(f32::trunc(-1.0f32), -1.0f32);
283-
assert_approx_eq!(f32::trunc(-1.3f32), -1.0f32);
284-
assert_approx_eq!(f32::trunc(-1.5f32), -1.0f32);
285-
assert_approx_eq!(f32::trunc(-1.7f32), -1.0f32);
276+
assert_approx_eq!(f32::math::trunc(1.0f32), 1.0f32);
277+
assert_approx_eq!(f32::math::trunc(1.3f32), 1.0f32);
278+
assert_approx_eq!(f32::math::trunc(1.5f32), 1.0f32);
279+
assert_approx_eq!(f32::math::trunc(1.7f32), 1.0f32);
280+
assert_approx_eq!(f32::math::trunc(0.0f32), 0.0f32);
281+
assert_approx_eq!(f32::math::trunc(-0.0f32), -0.0f32);
282+
assert_approx_eq!(f32::math::trunc(-1.0f32), -1.0f32);
283+
assert_approx_eq!(f32::math::trunc(-1.3f32), -1.0f32);
284+
assert_approx_eq!(f32::math::trunc(-1.5f32), -1.0f32);
285+
assert_approx_eq!(f32::math::trunc(-1.7f32), -1.0f32);
286286
}
287287

288288
#[test]
289289
fn test_fract() {
290-
assert_approx_eq!(f32::fract(1.0f32), 0.0f32);
291-
assert_approx_eq!(f32::fract(1.3f32), 0.3f32);
292-
assert_approx_eq!(f32::fract(1.5f32), 0.5f32);
293-
assert_approx_eq!(f32::fract(1.7f32), 0.7f32);
294-
assert_approx_eq!(f32::fract(0.0f32), 0.0f32);
295-
assert_approx_eq!(f32::fract(-0.0f32), -0.0f32);
296-
assert_approx_eq!(f32::fract(-1.0f32), -0.0f32);
297-
assert_approx_eq!(f32::fract(-1.3f32), -0.3f32);
298-
assert_approx_eq!(f32::fract(-1.5f32), -0.5f32);
299-
assert_approx_eq!(f32::fract(-1.7f32), -0.7f32);
290+
assert_approx_eq!(f32::math::fract(1.0f32), 0.0f32);
291+
assert_approx_eq!(f32::math::fract(1.3f32), 0.3f32);
292+
assert_approx_eq!(f32::math::fract(1.5f32), 0.5f32);
293+
assert_approx_eq!(f32::math::fract(1.7f32), 0.7f32);
294+
assert_approx_eq!(f32::math::fract(0.0f32), 0.0f32);
295+
assert_approx_eq!(f32::math::fract(-0.0f32), -0.0f32);
296+
assert_approx_eq!(f32::math::fract(-1.0f32), -0.0f32);
297+
assert_approx_eq!(f32::math::fract(-1.3f32), -0.3f32);
298+
assert_approx_eq!(f32::math::fract(-1.5f32), -0.5f32);
299+
assert_approx_eq!(f32::math::fract(-1.7f32), -0.7f32);
300300
}
301301

302302
#[test]
@@ -417,15 +417,15 @@ fn test_mul_add() {
417417
let nan: f32 = f32::NAN;
418418
let inf: f32 = f32::INFINITY;
419419
let neg_inf: f32 = f32::NEG_INFINITY;
420-
assert_approx_eq!(f32::mul_add(12.3f32, 4.5, 6.7), 62.05);
421-
assert_approx_eq!(f32::mul_add(-12.3f32, -4.5, -6.7), 48.65);
422-
assert_approx_eq!(f32::mul_add(0.0f32, 8.9, 1.2), 1.2);
423-
assert_approx_eq!(f32::mul_add(3.4f32, -0.0, 5.6), 5.6);
424-
assert!(f32::mul_add(nan, 7.8, 9.0).is_nan());
425-
assert_eq!(f32::mul_add(inf, 7.8, 9.0), inf);
426-
assert_eq!(f32::mul_add(neg_inf, 7.8, 9.0), neg_inf);
427-
assert_eq!(f32::mul_add(8.9f32, inf, 3.2), inf);
428-
assert_eq!(f32::mul_add(-3.2f32, 2.4, neg_inf), neg_inf);
420+
assert_approx_eq!(f32::math::mul_add(12.3f32, 4.5, 6.7), 62.05);
421+
assert_approx_eq!(f32::math::mul_add(-12.3f32, -4.5, -6.7), 48.65);
422+
assert_approx_eq!(f32::math::mul_add(0.0f32, 8.9, 1.2), 1.2);
423+
assert_approx_eq!(f32::math::mul_add(3.4f32, -0.0, 5.6), 5.6);
424+
assert!(f32::math::mul_add(nan, 7.8, 9.0).is_nan());
425+
assert_eq!(f32::math::mul_add(inf, 7.8, 9.0), inf);
426+
assert_eq!(f32::math::mul_add(neg_inf, 7.8, 9.0), neg_inf);
427+
assert_eq!(f32::math::mul_add(8.9f32, inf, 3.2), inf);
428+
assert_eq!(f32::math::mul_add(-3.2f32, 2.4, neg_inf), neg_inf);
429429
}
430430

431431
#[test]

0 commit comments

Comments
 (0)