Commit 0fda2f31aa

Marc Tiehuis <marc@tiehu.is>
2024-07-30 06:29:51
std.math.complex: tighten existing test bounds
master
1 parent 2bd7af6
Changed files (19)
lib
std
math
complex
abs.zig
acos.zig
acosh.zig
arg.zig
asin.zig
asinh.zig
atan.zig
atanh.zig
conj.zig
cos.zig
cosh.zig
log.zig
pow.zig
proj.zig
sin.zig
sinh.zig
sqrt.zig
tan.zig
tanh.zig
lib/std/math/complex/abs.zig
@@ -9,10 +9,9 @@ pub fn abs(z: anytype) @TypeOf(z.re, z.im) {
     return math.hypot(z.re, z.im);
 }
 
-const epsilon = 0.0001;
-
 test abs {
+    const epsilon = math.floatEps(f32);
     const a = Complex(f32).init(5, 3);
     const c = abs(a);
-    try testing.expect(math.approxEqAbs(f32, c, 5.83095, epsilon));
+    try testing.expectApproxEqAbs(5.8309517, c, epsilon);
 }
lib/std/math/complex/acos.zig
@@ -11,12 +11,11 @@ pub fn acos(z: anytype) Complex(@TypeOf(z.re, z.im)) {
     return Complex(T).init(@as(T, math.pi) / 2 - q.re, -q.im);
 }
 
-const epsilon = 0.0001;
-
 test acos {
+    const epsilon = math.floatEps(f32);
     const a = Complex(f32).init(5, 3);
     const c = acos(a);
 
-    try testing.expect(math.approxEqAbs(f32, c.re, 0.546975, epsilon));
-    try testing.expect(math.approxEqAbs(f32, c.im, -2.452914, epsilon));
+    try testing.expectApproxEqAbs(0.5469737, c.re, epsilon);
+    try testing.expectApproxEqAbs(-2.4529128, c.im, epsilon);
 }
lib/std/math/complex/acosh.zig
@@ -15,12 +15,11 @@ pub fn acosh(z: anytype) Complex(@TypeOf(z.re, z.im)) {
         Complex(T).init(-q.im, q.re);
 }
 
-const epsilon = 0.0001;
-
 test acosh {
+    const epsilon = math.floatEps(f32);
     const a = Complex(f32).init(5, 3);
     const c = acosh(a);
 
-    try testing.expect(math.approxEqAbs(f32, c.re, 2.452914, epsilon));
-    try testing.expect(math.approxEqAbs(f32, c.im, 0.546975, epsilon));
+    try testing.expectApproxEqAbs(2.4529128, c.re, epsilon);
+    try testing.expectApproxEqAbs(0.5469737, c.im, epsilon);
 }
lib/std/math/complex/arg.zig
@@ -9,10 +9,9 @@ pub fn arg(z: anytype) @TypeOf(z.re, z.im) {
     return math.atan2(z.im, z.re);
 }
 
-const epsilon = 0.0001;
-
 test arg {
+    const epsilon = math.floatEps(f32);
     const a = Complex(f32).init(5, 3);
     const c = arg(a);
-    try testing.expect(math.approxEqAbs(f32, c, 0.540420, epsilon));
+    try testing.expectApproxEqAbs(0.5404195, c, epsilon);
 }
lib/std/math/complex/asin.zig
@@ -17,12 +17,11 @@ pub fn asin(z: anytype) Complex(@TypeOf(z.re, z.im)) {
     return Complex(T).init(r.im, -r.re);
 }
 
-const epsilon = 0.0001;
-
 test asin {
+    const epsilon = math.floatEps(f32);
     const a = Complex(f32).init(5, 3);
     const c = asin(a);
 
-    try testing.expect(math.approxEqAbs(f32, c.re, 1.023822, epsilon));
-    try testing.expect(math.approxEqAbs(f32, c.im, 2.452914, epsilon));
+    try testing.expectApproxEqAbs(1.0238227, c.re, epsilon);
+    try testing.expectApproxEqAbs(2.4529128, c.im, epsilon);
 }
lib/std/math/complex/asinh.zig
@@ -12,12 +12,11 @@ pub fn asinh(z: anytype) Complex(@TypeOf(z.re, z.im)) {
     return Complex(T).init(r.im, -r.re);
 }
 
-const epsilon = 0.0001;
-
 test asinh {
+    const epsilon = math.floatEps(f32);
     const a = Complex(f32).init(5, 3);
     const c = asinh(a);
 
-    try testing.expect(math.approxEqAbs(f32, c.re, 2.459831, epsilon));
-    try testing.expect(math.approxEqAbs(f32, c.im, 0.533999, epsilon));
+    try testing.expectApproxEqAbs(2.4598298, c.re, epsilon);
+    try testing.expectApproxEqAbs(0.5339993, c.im, epsilon);
 }
lib/std/math/complex/atan.zig
@@ -88,20 +88,20 @@ fn atan64(z: Complex(f64)) Complex(f64) {
     return Complex(f64).init(w, 0.25 * @log(a));
 }
 
-const epsilon = 0.0001;
-
 test atan32 {
+    const epsilon = math.floatEps(f32);
     const a = Complex(f32).init(5, 3);
     const c = atan(a);
 
-    try testing.expect(math.approxEqAbs(f32, c.re, 1.423679, epsilon));
-    try testing.expect(math.approxEqAbs(f32, c.im, 0.086569, epsilon));
+    try testing.expectApproxEqAbs(1.423679, c.re, epsilon);
+    try testing.expectApproxEqAbs(0.086569, c.im, epsilon);
 }
 
 test atan64 {
+    const epsilon = math.floatEps(f64);
     const a = Complex(f64).init(5, 3);
     const c = atan(a);
 
-    try testing.expect(math.approxEqAbs(f64, c.re, 1.423679, epsilon));
-    try testing.expect(math.approxEqAbs(f64, c.im, 0.086569, epsilon));
+    try testing.expectApproxEqAbs(1.4236790442393028, c.re, epsilon);
+    try testing.expectApproxEqAbs(0.08656905917945844, c.im, epsilon);
 }
lib/std/math/complex/atanh.zig
@@ -12,12 +12,11 @@ pub fn atanh(z: anytype) Complex(@TypeOf(z.re, z.im)) {
     return Complex(T).init(r.im, -r.re);
 }
 
-const epsilon = 0.0001;
-
 test atanh {
+    const epsilon = math.floatEps(f32);
     const a = Complex(f32).init(5, 3);
     const c = atanh(a);
 
-    try testing.expect(math.approxEqAbs(f32, c.re, 0.146947, epsilon));
-    try testing.expect(math.approxEqAbs(f32, c.im, 1.480870, epsilon));
+    try testing.expectApproxEqAbs(0.14694665, c.re, epsilon);
+    try testing.expectApproxEqAbs(1.4808695, c.im, epsilon);
 }
lib/std/math/complex/conj.zig
@@ -14,5 +14,6 @@ test conj {
     const a = Complex(f32).init(5, 3);
     const c = a.conjugate();
 
-    try testing.expect(c.re == 5 and c.im == -3);
+    try testing.expectEqual(5, c.re);
+    try testing.expectEqual(-3, c.im);
 }
lib/std/math/complex/cos.zig
@@ -11,12 +11,11 @@ pub fn cos(z: anytype) Complex(@TypeOf(z.re, z.im)) {
     return cmath.cosh(p);
 }
 
-const epsilon = 0.0001;
-
 test cos {
+    const epsilon = math.floatEps(f32);
     const a = Complex(f32).init(5, 3);
     const c = cos(a);
 
-    try testing.expect(math.approxEqAbs(f32, c.re, 2.855815, epsilon));
-    try testing.expect(math.approxEqAbs(f32, c.im, 9.606383, epsilon));
+    try testing.expectApproxEqAbs(2.8558152, c.re, epsilon);
+    try testing.expectApproxEqAbs(9.606383, c.im, epsilon);
 }
lib/std/math/complex/cosh.zig
@@ -153,20 +153,20 @@ fn cosh64(z: Complex(f64)) Complex(f64) {
     return Complex(f64).init((x * x) * (y - y), (x + x) * (y - y));
 }
 
-const epsilon = 0.0001;
-
 test cosh32 {
+    const epsilon = math.floatEps(f32);
     const a = Complex(f32).init(5, 3);
     const c = cosh(a);
 
-    try testing.expect(math.approxEqAbs(f32, c.re, -73.467300, epsilon));
-    try testing.expect(math.approxEqAbs(f32, c.im, 10.471557, epsilon));
+    try testing.expectApproxEqAbs(-73.467300, c.re, epsilon);
+    try testing.expectApproxEqAbs(10.471557, c.im, epsilon);
 }
 
 test cosh64 {
+    const epsilon = math.floatEps(f64);
     const a = Complex(f64).init(5, 3);
     const c = cosh(a);
 
-    try testing.expect(math.approxEqAbs(f64, c.re, -73.467300, epsilon));
-    try testing.expect(math.approxEqAbs(f64, c.im, 10.471557, epsilon));
+    try testing.expectApproxEqAbs(-73.46729221264526, c.re, epsilon);
+    try testing.expectApproxEqAbs(10.471557674805572, c.im, epsilon);
 }
lib/std/math/complex/log.zig
@@ -13,12 +13,11 @@ pub fn log(z: anytype) Complex(@TypeOf(z.re, z.im)) {
     return Complex(T).init(@log(r), phi);
 }
 
-const epsilon = 0.0001;
-
 test log {
+    const epsilon = math.floatEps(f32);
     const a = Complex(f32).init(5, 3);
     const c = log(a);
 
-    try testing.expect(math.approxEqAbs(f32, c.re, 1.763180, epsilon));
-    try testing.expect(math.approxEqAbs(f32, c.im, 0.540419, epsilon));
+    try testing.expectApproxEqAbs(1.7631803, c.re, epsilon);
+    try testing.expectApproxEqAbs(0.5404195, c.im, epsilon);
 }
lib/std/math/complex/pow.zig
@@ -9,13 +9,12 @@ pub fn pow(z: anytype, s: anytype) Complex(@TypeOf(z.re, z.im, s.re, s.im)) {
     return cmath.exp(cmath.log(z).mul(s));
 }
 
-const epsilon = 0.0001;
-
 test pow {
+    const epsilon = math.floatEps(f32);
     const a = Complex(f32).init(5, 3);
     const b = Complex(f32).init(2.3, -1.3);
     const c = pow(a, b);
 
-    try testing.expect(math.approxEqAbs(f32, c.re, 58.049110, epsilon));
-    try testing.expect(math.approxEqAbs(f32, c.im, -101.003433, epsilon));
+    try testing.expectApproxEqAbs(58.049110, c.re, epsilon);
+    try testing.expectApproxEqAbs(-101.003433, c.im, epsilon);
 }
lib/std/math/complex/proj.zig
@@ -19,5 +19,6 @@ test proj {
     const a = Complex(f32).init(5, 3);
     const c = proj(a);
 
-    try testing.expect(c.re == 5 and c.im == 3);
+    try testing.expectEqual(5, c.re);
+    try testing.expectEqual(3, c.im);
 }
lib/std/math/complex/sin.zig
@@ -12,12 +12,11 @@ pub fn sin(z: anytype) Complex(@TypeOf(z.re, z.im)) {
     return Complex(T).init(q.im, -q.re);
 }
 
-const epsilon = 0.0001;
-
 test sin {
+    const epsilon = math.floatEps(f32);
     const a = Complex(f32).init(5, 3);
     const c = sin(a);
 
-    try testing.expect(math.approxEqAbs(f32, c.re, -9.654126, epsilon));
-    try testing.expect(math.approxEqAbs(f32, c.im, 2.841692, epsilon));
+    try testing.expectApproxEqAbs(-9.654126, c.re, epsilon);
+    try testing.expectApproxEqAbs(2.8416924, c.im, epsilon);
 }
lib/std/math/complex/sinh.zig
@@ -152,20 +152,20 @@ fn sinh64(z: Complex(f64)) Complex(f64) {
     return Complex(f64).init((x * x) * (y - y), (x + x) * (y - y));
 }
 
-const epsilon = 0.0001;
-
 test sinh32 {
+    const epsilon = math.floatEps(f32);
     const a = Complex(f32).init(5, 3);
     const c = sinh(a);
 
-    try testing.expect(math.approxEqAbs(f32, c.re, -73.460617, epsilon));
-    try testing.expect(math.approxEqAbs(f32, c.im, 10.472508, epsilon));
+    try testing.expectApproxEqAbs(-73.460617, c.re, epsilon);
+    try testing.expectApproxEqAbs(10.472508, c.im, epsilon);
 }
 
 test sinh64 {
+    const epsilon = math.floatEps(f64);
     const a = Complex(f64).init(5, 3);
     const c = sinh(a);
 
-    try testing.expect(math.approxEqAbs(f64, c.re, -73.460617, epsilon));
-    try testing.expect(math.approxEqAbs(f64, c.im, 10.472508, epsilon));
+    try testing.expectApproxEqAbs(-73.46062169567367, c.re, epsilon);
+    try testing.expectApproxEqAbs(10.472508533940392, c.im, epsilon);
 }
lib/std/math/complex/sqrt.zig
@@ -127,20 +127,20 @@ fn sqrt64(z: Complex(f64)) Complex(f64) {
     return result;
 }
 
-const epsilon = 0.0001;
-
 test sqrt32 {
+    const epsilon = math.floatEps(f32);
     const a = Complex(f32).init(5, 3);
     const c = sqrt(a);
 
-    try testing.expect(math.approxEqAbs(f32, c.re, 2.327117, epsilon));
-    try testing.expect(math.approxEqAbs(f32, c.im, 0.644574, epsilon));
+    try testing.expectApproxEqAbs(2.3271174, c.re, epsilon);
+    try testing.expectApproxEqAbs(0.6445742, c.im, epsilon);
 }
 
 test sqrt64 {
+    const epsilon = math.floatEps(f64);
     const a = Complex(f64).init(5, 3);
     const c = sqrt(a);
 
-    try testing.expect(math.approxEqAbs(f64, c.re, 2.3271175190399496, epsilon));
-    try testing.expect(math.approxEqAbs(f64, c.im, 0.6445742373246469, epsilon));
+    try testing.expectApproxEqAbs(2.3271175190399496, c.re, epsilon);
+    try testing.expectApproxEqAbs(0.6445742373246469, c.im, epsilon);
 }
lib/std/math/complex/tan.zig
@@ -12,12 +12,11 @@ pub fn tan(z: anytype) Complex(@TypeOf(z.re, z.im)) {
     return Complex(T).init(r.im, -r.re);
 }
 
-const epsilon = 0.0001;
-
 test tan {
+    const epsilon = math.floatEps(f32);
     const a = Complex(f32).init(5, 3);
     const c = tan(a);
 
-    try testing.expect(math.approxEqAbs(f32, c.re, -0.002708233, epsilon));
-    try testing.expect(math.approxEqAbs(f32, c.im, 1.004165, epsilon));
+    try testing.expectApproxEqAbs(-0.002708233, c.re, epsilon);
+    try testing.expectApproxEqAbs(1.0041647, c.im, epsilon);
 }
lib/std/math/complex/tanh.zig
@@ -101,20 +101,20 @@ fn tanh64(z: Complex(f64)) Complex(f64) {
     return Complex(f64).init((beta * rho * s) / den, t / den);
 }
 
-const epsilon = 0.0001;
-
 test tanh32 {
+    const epsilon = math.floatEps(f32);
     const a = Complex(f32).init(5, 3);
     const c = tanh(a);
 
-    try testing.expect(math.approxEqAbs(f32, c.re, 0.999913, epsilon));
-    try testing.expect(math.approxEqAbs(f32, c.im, -0.000025, epsilon));
+    try testing.expectApproxEqAbs(0.99991274, c.re, epsilon);
+    try testing.expectApproxEqAbs(-0.00002536878, c.im, epsilon);
 }
 
 test tanh64 {
+    const epsilon = math.floatEps(f64);
     const a = Complex(f64).init(5, 3);
     const c = tanh(a);
 
-    try testing.expect(math.approxEqAbs(f64, c.re, 0.999913, epsilon));
-    try testing.expect(math.approxEqAbs(f64, c.im, -0.000025, epsilon));
+    try testing.expectApproxEqAbs(0.9999128201513536, c.re, epsilon);
+    try testing.expectApproxEqAbs(-0.00002536867620767604, c.im, epsilon);
 }