Commit 06a26f0965deff3d752da3d448b34872010d80f3 | zig

author	Andrew Kelley <andrew@ziglang.org> 2018-06-16 21:32:53-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2018-06-16 21:32:53-04:00
log	06a26f0965deff3d752da3d448b34872010d80f3
tree	0e41e31ae4370f43011ba1eadfe1d2e4fb6493b2
parent	751518787ae9772eb063a4911a10bf30b2c2a19c

std.Complex: use better arg passing convention and fix a TODO

2 files changed, 11 insertions(+), 12 deletions(-)

std
- math
  - complex
    index.zig
    sqrt.zig

std/math/complex/index.zig+7-7

...	...	@@ -37,28 +37,28 @@ pub fn Complex(comptime T: type) type {
37	37	};
38	38	}
39	39
40		pub fn add(self: const Self, other: const Self) Self {
	40	pub fn add(self: Self, other: Self) Self {
41	41	return Self{
42	42	.re = self.re + other.re,
43	43	.im = self.im + other.im,
44	44	};
45	45	}
46	46
47		pub fn sub(self: const Self, other: const Self) Self {
	47	pub fn sub(self: Self, other: Self) Self {
48	48	return Self{
49	49	.re = self.re - other.re,
50	50	.im = self.im - other.im,
51	51	};
52	52	}
53	53
54		pub fn mul(self: const Self, other: const Self) Self {
	54	pub fn mul(self: Self, other: Self) Self {
55	55	return Self{
56	56	.re = self.re * other.re - self.im * other.im,
57	57	.im = self.im * other.re + self.re * other.im,
58	58	};
59	59	}
60	60
61		pub fn div(self: const Self, other: const Self) Self {
	61	pub fn div(self: Self, other: Self) Self {
62	62	const re_num = self.re * other.re + self.im * other.im;
63	63	const im_num = self.im * other.re - self.re * other.im;
64	64	const den = other.re * other.re + other.im * other.im;
...	...	@@ -69,14 +69,14 @@ pub fn Complex(comptime T: type) type {
69	69	};
70	70	}
71	71
72		pub fn conjugate(self: *const Self) Self {
	72	pub fn conjugate(self: Self) Self {
73	73	return Self{
74	74	.re = self.re,
75	75	.im = -self.im,
76	76	};
77	77	}
78	78
79		pub fn reciprocal(self: *const Self) Self {
	79	pub fn reciprocal(self: Self) Self {
80	80	const m = self.re * self.re + self.im * self.im;
81	81	return Self{
82	82	.re = self.re / m,
...	...	@@ -84,7 +84,7 @@ pub fn Complex(comptime T: type) type {
84	84	};
85	85	}
86	86
87		pub fn magnitude(self: *const Self) T {
	87	pub fn magnitude(self: Self) T {
88	88	return math.sqrt(self.re * self.re + self.im * self.im);
89	89	}
90	90	};

std/math/complex/sqrt.zig+4-5

...	...	@@ -4,18 +4,17 @@ const math = std.math;
4	4	const cmath = math.complex;
5	5	const Complex = cmath.Complex;
6	6
7		// TODO when #733 is solved this can be @typeOf(z) instead of Complex(@typeOf(z.re))
8		pub fn sqrt(z: var) Complex(@typeOf(z.re)) {
	7	pub fn sqrt(z: var) @typeOf(z) {
9	8	const T = @typeOf(z.re);
10	9
11	10	return switch (T) {
12	11	f32 => sqrt32(z),
13	12	f64 => sqrt64(z),
14		else => @compileError("sqrt not implemented for " ++ @typeName(z)),
	13	else => @compileError("sqrt not implemented for " ++ @typeName(T)),
15	14	};
16	15	}
17	16
18		fn sqrt32(z: *const Complex(f32)) Complex(f32) {
	17	fn sqrt32(z: Complex(f32)) Complex(f32) {
19	18	const x = z.re;
20	19	const y = z.im;
21	20
...	...	@@ -57,7 +56,7 @@ fn sqrt32(z: *const Complex(f32)) Complex(f32) {
57	56	}
58	57	}
59	58
60		fn sqrt64(z: *const Complex(f64)) Complex(f64) {
	59	fn sqrt64(z: Complex(f64)) Complex(f64) {
61	60	// may encounter overflow for im,re >= DBL_MAX / (1 + sqrt(2))
62	61	const threshold = 0x1.a827999fcef32p+1022;
63	62