@pkmn/engine 0.1.0-dev.b01cb48c → 0.1.0-dev.b3197aa3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +1 -1
- package/README.md +54 -6
- package/build/pkg/addon/browser.d.ts +3 -0
- package/build/pkg/addon/browser.js +47 -0
- package/build/pkg/addon/browser.js.map +1 -0
- package/build/pkg/addon/node.d.ts +3 -0
- package/build/pkg/addon/node.js +110 -0
- package/build/pkg/addon/node.js.map +1 -0
- package/build/pkg/addon/wasm.d.ts +2 -0
- package/build/pkg/addon/wasm.js +53 -0
- package/build/pkg/addon/wasm.js.map +1 -0
- package/build/pkg/addon.d.ts +25 -3
- package/build/pkg/addon.js +34 -65
- package/build/pkg/addon.js.map +1 -1
- package/build/pkg/data/layout.json +15 -2
- package/build/pkg/data/protocol.json +23 -9
- package/build/pkg/data.d.ts +23 -1
- package/build/pkg/data.js.map +1 -1
- package/build/pkg/gen1.d.ts +15 -18
- package/build/pkg/gen1.js +28 -19
- package/build/pkg/gen1.js.map +1 -1
- package/build/pkg/index.d.ts +40 -90
- package/build/pkg/index.js +23 -70
- package/build/pkg/index.js.map +1 -1
- package/build/pkg/protocol.d.ts +20 -1
- package/build/pkg/protocol.js +105 -103
- package/build/pkg/protocol.js.map +1 -1
- package/build/tools/debug.js +52 -76
- package/build/tools/debug.js.map +1 -1
- package/build/tools/display/debug.jsx +152 -0
- package/build/tools/display/debug.jsx.map +1 -0
- package/build/tools/display/index.js +152 -0
- package/build/tools/display/index.js.map +1 -0
- package/build/tools/display/ui.jsx +359 -0
- package/build/tools/display/ui.jsx.map +1 -0
- package/build/tools/display/util.js +33 -0
- package/build/tools/display/util.js.map +1 -0
- package/build.zig +331 -85
- package/package.json +56 -136
- package/src/bin/install-pkmn-engine +10 -7
- package/src/bin/pkmn-debug +1 -1
- package/src/lib/bindings/c.zig +255 -0
- package/src/lib/bindings/node.zig +117 -0
- package/src/lib/bindings/wasm.zig +59 -0
- package/src/lib/common/array.zig +77 -0
- package/src/lib/common/data.zig +8 -8
- package/src/lib/common/debug.zig +39 -8
- package/src/lib/common/js.zig +4 -6
- package/src/lib/common/napi.zig +4 -0
- package/src/lib/common/optional.zig +13 -9
- package/src/lib/common/options.zig +4 -0
- package/src/lib/common/protocol.zig +44 -43
- package/src/lib/common/rational.zig +317 -304
- package/src/lib/common/rng.zig +5 -7
- package/src/lib/common/util.zig +65 -1
- package/src/lib/gen1/calc.zig +266 -135
- package/src/lib/gen1/chance.zig +469 -110
- package/src/lib/gen1/data/moves.zig +2 -4
- package/src/lib/gen1/data/species.zig +1 -3
- package/src/lib/gen1/data/types.zig +2 -3
- package/src/lib/gen1/data.zig +35 -38
- package/src/lib/gen1/helpers.zig +17 -27
- package/src/lib/gen1/mechanics.zig +213 -160
- package/src/lib/gen2/calc.zig +37 -27
- package/src/lib/gen2/chance.zig +87 -67
- package/src/lib/gen2/data/items.zig +1 -3
- package/src/lib/gen2/data/moves.zig +2 -4
- package/src/lib/gen2/data/species.zig +1 -3
- package/src/lib/gen2/data/types.zig +7 -5
- package/src/lib/gen2/data.zig +28 -30
- package/src/lib/gen2/generated.zig +18 -23
- package/src/lib/gen2/helpers.zig +9 -18
- package/src/lib/gen2/mechanics.zig +82 -82
- package/src/lib/node.zig +4 -121
- package/src/lib/pkmn.zig +14 -7
- package/src/lib/wasm.zig +13 -9
- package/src/tools/display/dom.ts +93 -0
- package/src/tools/display/ui.css +354 -0
- package/build/test/display.js +0 -405
- package/build/test/display.js.map +0 -1
- package/src/test/display/pkmn.html.tmpl +0 -368
|
@@ -6,11 +6,36 @@ const expect = std.testing.expect;
|
|
|
6
6
|
const expectEqual = std.testing.expectEqual;
|
|
7
7
|
const expectError = std.testing.expectError;
|
|
8
8
|
|
|
9
|
+
const Int = if (@hasField(std.builtin.Type, "int")) .int else .Int;
|
|
10
|
+
const Float = if (@hasField(std.builtin.Type, "float")) .float else .Float;
|
|
11
|
+
const ComptimeInt =
|
|
12
|
+
if (@hasField(std.builtin.Type, "comptime_int")) .comptime_int else .ComptimeInt;
|
|
13
|
+
const ComptimeFloat =
|
|
14
|
+
if (@hasField(std.builtin.Type, "comptime_float")) .comptime_float else .ComptimeFloat;
|
|
15
|
+
|
|
9
16
|
/// Specialization of a rational number used by the engine to compute probabilties.
|
|
10
17
|
/// For performance reasons the rational is only reduced lazily and thus `reduce` must be
|
|
11
|
-
/// invoked explicitly before reading.
|
|
18
|
+
/// invoked explicitly before reading. Note that this laziness means that this implementation
|
|
19
|
+
/// sometimes overflows in places where an eager reduced implementation would not - to achieve
|
|
20
|
+
/// the same behavior as an eager implementation simply call `reduce` after each operation.
|
|
12
21
|
pub fn Rational(comptime T: type) type {
|
|
13
|
-
|
|
22
|
+
// With floats we can't rely on an overflow bit to let us know when to reduce, so we
|
|
23
|
+
// instead start reducing when we get sufficiently close to the limit of the mantissa
|
|
24
|
+
// (in our domain we expect updates to involve numbers < 2**10, so we should be safe
|
|
25
|
+
// not reducing before we are 2**10 away from "overflowing" the mantissa)
|
|
26
|
+
const o = if (@typeInfo(T) == Float)
|
|
27
|
+
std.math.pow(T, 2, std.math.floatMantissaBits(T) - 10)
|
|
28
|
+
else
|
|
29
|
+
0;
|
|
30
|
+
|
|
31
|
+
const Err = switch (@typeInfo(T)) {
|
|
32
|
+
Int => error{Overflow},
|
|
33
|
+
Float => error{},
|
|
34
|
+
else => unreachable,
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
// Zig doesn't allow integers > u128 in an extern struct...
|
|
38
|
+
return if (@sizeOf(T) <= 16) extern struct {
|
|
14
39
|
const Self = @This();
|
|
15
40
|
|
|
16
41
|
/// Numerator. Must always be >= 1. Not guaranteed to be reduced in all cases.
|
|
@@ -18,21 +43,8 @@ pub fn Rational(comptime T: type) type {
|
|
|
18
43
|
/// Denominator. Must always be >= 1. Not guaranteed to be reduced in all cases.
|
|
19
44
|
q: T = 1,
|
|
20
45
|
|
|
21
|
-
// With floats we can't rely on an overflow bit to let us know when to reduce, so we instead
|
|
22
|
-
// start reducing when we get sufficiently close to the limit of the mantissa (in our domain
|
|
23
|
-
// we expect updates to involve numbers < 2**10, so we should be safe not reducing before we
|
|
24
|
-
// are 2**10 away from "overflowing" the mantissa)
|
|
25
|
-
const REDUCE = if (@typeInfo(T) == .Float)
|
|
26
|
-
std.math.pow(T, 2, std.math.floatMantissaBits(T) - 10)
|
|
27
|
-
else
|
|
28
|
-
0;
|
|
29
|
-
|
|
30
46
|
/// Possible error returned by operations on the Rational.
|
|
31
|
-
pub const Error =
|
|
32
|
-
.Int => error{Overflow},
|
|
33
|
-
.Float => error{},
|
|
34
|
-
else => unreachable,
|
|
35
|
-
};
|
|
47
|
+
pub const Error = Err;
|
|
36
48
|
|
|
37
49
|
/// Resets the rational back to 1.
|
|
38
50
|
pub fn reset(r: *Self) void {
|
|
@@ -43,135 +55,27 @@ pub fn Rational(comptime T: type) type {
|
|
|
43
55
|
/// Update the rational by multiplying its numerator by p and its denominator by q.
|
|
44
56
|
/// Both p and q must be >= 1, and if computable at comptime must have no common factors.
|
|
45
57
|
pub fn update(r: *Self, p: anytype, q: anytype) Error!void {
|
|
46
|
-
|
|
47
|
-
assert(p >= 1);
|
|
48
|
-
assert(q >= 1);
|
|
49
|
-
|
|
50
|
-
// If our parameters are not fully reduced they may prematurely
|
|
51
|
-
// cause overflow/loss of precision after the multiplication below
|
|
52
|
-
assert(switch (@typeInfo(@TypeOf(p, q))) {
|
|
53
|
-
.ComptimeInt, .ComptimeFloat => comptime gcd(p, q),
|
|
54
|
-
else => 1,
|
|
55
|
-
} == 1);
|
|
56
|
-
|
|
57
|
-
switch (@typeInfo(T)) {
|
|
58
|
-
.Int => {
|
|
59
|
-
// Greedily attempt to multiply and if it fails, reduce and try again
|
|
60
|
-
r.multiplication(p, q) catch |err| switch (err) {
|
|
61
|
-
error.Overflow => {
|
|
62
|
-
r.reduce();
|
|
63
|
-
try r.multiplication(p, q);
|
|
64
|
-
},
|
|
65
|
-
else => unreachable,
|
|
66
|
-
};
|
|
67
|
-
},
|
|
68
|
-
.Float => {
|
|
69
|
-
// Reduce in situations where we're likely to start losing precision
|
|
70
|
-
if (r.q > REDUCE or r.p > REDUCE) r.reduce();
|
|
71
|
-
|
|
72
|
-
r.p *= switch (@typeInfo(@TypeOf(p))) {
|
|
73
|
-
.Float, .ComptimeFloat => p,
|
|
74
|
-
else => @floatFromInt(p),
|
|
75
|
-
};
|
|
76
|
-
r.q *= switch (@typeInfo(@TypeOf(q))) {
|
|
77
|
-
.Float, .ComptimeFloat => q,
|
|
78
|
-
else => @floatFromInt(q),
|
|
79
|
-
};
|
|
80
|
-
|
|
81
|
-
// We should always be dealing with whole numbers
|
|
82
|
-
assert(std.math.modf(r.p).fpart == 0);
|
|
83
|
-
assert(std.math.modf(r.q).fpart == 0);
|
|
84
|
-
},
|
|
85
|
-
else => unreachable,
|
|
86
|
-
}
|
|
58
|
+
return update_(T, o, r, p, q);
|
|
87
59
|
}
|
|
88
60
|
|
|
89
61
|
/// Add two rationals using the identity (a/b) + (c/d) = (ad+bc)/(bd).
|
|
90
|
-
pub fn add(r: *Self, s:
|
|
91
|
-
|
|
92
|
-
.Int => {
|
|
93
|
-
if (r.q == s.q) {
|
|
94
|
-
r.p = std.math.add(T, r.p, s.p) catch |err| switch (err) {
|
|
95
|
-
error.Overflow => val: {
|
|
96
|
-
r.reduce();
|
|
97
|
-
s.reduce();
|
|
98
|
-
break :val try std.math.add(T, r.p, s.p);
|
|
99
|
-
},
|
|
100
|
-
else => unreachable,
|
|
101
|
-
};
|
|
102
|
-
} else {
|
|
103
|
-
r.addition(s.p, s.q) catch |err| switch (err) {
|
|
104
|
-
error.Overflow => {
|
|
105
|
-
r.reduce();
|
|
106
|
-
s.reduce();
|
|
107
|
-
try r.addition(s.p, s.q);
|
|
108
|
-
},
|
|
109
|
-
else => unreachable,
|
|
110
|
-
};
|
|
111
|
-
}
|
|
112
|
-
},
|
|
113
|
-
.Float => {
|
|
114
|
-
if (r.q == s.q) {
|
|
115
|
-
if (r.p > REDUCE) r.reduce();
|
|
116
|
-
if (s.p > REDUCE) s.reduce();
|
|
117
|
-
|
|
118
|
-
r.p += s.p;
|
|
119
|
-
} else {
|
|
120
|
-
// Always reduce to minimize loss of precision from the multiplications
|
|
121
|
-
r.reduce();
|
|
122
|
-
s.reduce();
|
|
123
|
-
|
|
124
|
-
r.p = (r.p * s.q) + (r.q * s.p);
|
|
125
|
-
r.q *= s.q;
|
|
126
|
-
}
|
|
127
|
-
|
|
128
|
-
assert(std.math.modf(r.p).fpart == 0);
|
|
129
|
-
assert(std.math.modf(r.q).fpart == 0);
|
|
130
|
-
},
|
|
131
|
-
else => unreachable,
|
|
132
|
-
}
|
|
62
|
+
pub fn add(r: *Self, s: anytype) Error!void {
|
|
63
|
+
return add_(T, o, r, s);
|
|
133
64
|
}
|
|
134
65
|
|
|
135
66
|
/// Multiplies two rationals.
|
|
136
|
-
pub fn mul(r: *Self, s:
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
r.multiplication(s.p, s.q) catch |err| switch (err) {
|
|
140
|
-
error.Overflow => {
|
|
141
|
-
r.reduce();
|
|
142
|
-
s.reduce();
|
|
143
|
-
try r.multiplication(s.p, s.q);
|
|
144
|
-
},
|
|
145
|
-
else => unreachable,
|
|
146
|
-
};
|
|
147
|
-
},
|
|
148
|
-
.Float => {
|
|
149
|
-
if (r.q > REDUCE or r.p > REDUCE) r.reduce();
|
|
150
|
-
if (s.q > REDUCE or s.p > REDUCE) s.reduce();
|
|
151
|
-
|
|
152
|
-
r.p *= s.p;
|
|
153
|
-
r.q *= s.q;
|
|
67
|
+
pub fn mul(r: *Self, s: anytype) Error!void {
|
|
68
|
+
return mul_(T, o, r, s);
|
|
69
|
+
}
|
|
154
70
|
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
else => unreachable,
|
|
159
|
-
}
|
|
71
|
+
/// Compares two rationals using the identity (a/b) > (c/d) => ad > bc
|
|
72
|
+
pub fn cmp(r: *Self, s: anytype) Error!std.math.Order {
|
|
73
|
+
return cmp_(T, o, r, s);
|
|
160
74
|
}
|
|
161
75
|
|
|
162
76
|
/// Normalize the rational by reducing by the greatest common divisor.
|
|
163
77
|
pub fn reduce(r: *Self) void {
|
|
164
|
-
|
|
165
|
-
if (d == 1) return;
|
|
166
|
-
|
|
167
|
-
assert(@mod(r.p, d) == 0);
|
|
168
|
-
assert(@mod(r.q, d) == 0);
|
|
169
|
-
|
|
170
|
-
r.p /= d;
|
|
171
|
-
r.q /= d;
|
|
172
|
-
|
|
173
|
-
assert(r.p >= 1);
|
|
174
|
-
assert(r.q >= 1);
|
|
78
|
+
reduce_(r);
|
|
175
79
|
}
|
|
176
80
|
|
|
177
81
|
pub fn format(
|
|
@@ -183,64 +87,271 @@ pub fn Rational(comptime T: type) type {
|
|
|
183
87
|
_ = .{ fmt, opts };
|
|
184
88
|
try writer.print("{d}/{d}", .{ self.p, self.q });
|
|
185
89
|
}
|
|
90
|
+
} else struct {
|
|
91
|
+
const Self = @This();
|
|
92
|
+
|
|
93
|
+
/// Numerator. Must always be >= 1. Not guaranteed to be reduced in all cases.
|
|
94
|
+
p: T = 1,
|
|
95
|
+
/// Denominator. Must always be >= 1. Not guaranteed to be reduced in all cases.
|
|
96
|
+
q: T = 1,
|
|
97
|
+
|
|
98
|
+
/// Possible error returned by operations on the Rational.
|
|
99
|
+
pub const Error = Err;
|
|
186
100
|
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
r.
|
|
101
|
+
/// Resets the rational back to 1.
|
|
102
|
+
pub fn reset(r: *Self) void {
|
|
103
|
+
r.p = 1;
|
|
104
|
+
r.q = 1;
|
|
190
105
|
}
|
|
191
106
|
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
107
|
+
/// Update the rational by multiplying its numerator by p and its denominator by q.
|
|
108
|
+
/// Both p and q must be >= 1, and if computable at comptime must have no common factors.
|
|
109
|
+
pub fn update(r: *Self, p: anytype, q: anytype) Error!void {
|
|
110
|
+
return update_(T, o, r, p, q);
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
/// Add two rationals using the identity (a/b) + (c/d) = (ad+bc)/(bd).
|
|
114
|
+
pub fn add(r: *Self, s: anytype) Error!void {
|
|
115
|
+
return add_(T, o, r, s);
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
/// Multiplies two rationals.
|
|
119
|
+
pub fn mul(r: *Self, s: anytype) Error!void {
|
|
120
|
+
return mul_(T, o, r, s);
|
|
121
|
+
}
|
|
197
122
|
|
|
198
|
-
|
|
199
|
-
|
|
123
|
+
/// Compares two rationals using the identity (a/b) > (c/d) => ad > bc
|
|
124
|
+
pub fn cmp(r: *Self, s: anytype) Error!std.math.Order {
|
|
125
|
+
return cmp_(T, o, r, s);
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
/// Normalize the rational by reducing by the greatest common divisor.
|
|
129
|
+
pub fn reduce(r: *Self) void {
|
|
130
|
+
reduce_(r);
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
pub fn format(
|
|
134
|
+
self: Self,
|
|
135
|
+
comptime fmt: []const u8,
|
|
136
|
+
opts: std.fmt.FormatOptions,
|
|
137
|
+
writer: anytype,
|
|
138
|
+
) !void {
|
|
139
|
+
_ = .{ fmt, opts };
|
|
140
|
+
try writer.print("{d}/{d}", .{ self.p, self.q });
|
|
200
141
|
}
|
|
201
142
|
};
|
|
202
143
|
}
|
|
203
144
|
|
|
204
|
-
|
|
205
|
-
|
|
145
|
+
fn update_(comptime T: type, comptime o: comptime_int, r: anytype, p: anytype, q: anytype) !void {
|
|
146
|
+
// std.debug.print("({d}/{d}) * ", .{ p, q }); // DEBUG
|
|
206
147
|
assert(p >= 1);
|
|
207
148
|
assert(q >= 1);
|
|
208
149
|
|
|
209
|
-
|
|
150
|
+
// If our parameters are not fully reduced they may prematurely
|
|
151
|
+
// cause overflow/loss of precision after the multiplication below
|
|
152
|
+
assert(switch (@typeInfo(@TypeOf(p, q))) {
|
|
153
|
+
ComptimeInt, ComptimeFloat => comptime gcd(p, q),
|
|
154
|
+
else => 1,
|
|
155
|
+
} == 1);
|
|
156
|
+
|
|
210
157
|
switch (@typeInfo(T)) {
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
158
|
+
Int => {
|
|
159
|
+
// Greedily attempt to multiply and if it fails, reduce and try again
|
|
160
|
+
multiplication(T, r, p, q) catch |err| switch (err) {
|
|
161
|
+
error.Overflow => {
|
|
162
|
+
r.reduce();
|
|
163
|
+
try multiplication(T, r, p, q);
|
|
164
|
+
},
|
|
165
|
+
else => unreachable,
|
|
166
|
+
};
|
|
167
|
+
},
|
|
168
|
+
Float => {
|
|
169
|
+
// Reduce in situations where we're likely to start losing precision
|
|
170
|
+
if (r.q > o or r.p > o) r.reduce();
|
|
171
|
+
|
|
172
|
+
r.p *= switch (@typeInfo(@TypeOf(p))) {
|
|
173
|
+
Float, ComptimeFloat => p,
|
|
174
|
+
else => @floatFromInt(p),
|
|
175
|
+
};
|
|
176
|
+
r.q *= switch (@typeInfo(@TypeOf(q))) {
|
|
177
|
+
Float, ComptimeFloat => q,
|
|
178
|
+
else => @floatFromInt(q),
|
|
179
|
+
};
|
|
180
|
+
|
|
181
|
+
// We should always be dealing with whole numbers
|
|
182
|
+
assert(std.math.modf(r.p).fpart == 0);
|
|
183
|
+
assert(std.math.modf(r.q).fpart == 0);
|
|
184
|
+
},
|
|
185
|
+
else => unreachable,
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
fn add_(comptime T: type, comptime o: comptime_int, r: anytype, s: anytype) !void {
|
|
190
|
+
switch (@typeInfo(T)) {
|
|
191
|
+
Int => {
|
|
192
|
+
if (r.q == s.q) {
|
|
193
|
+
r.p = std.math.add(T, r.p, s.p) catch |err| switch (err) {
|
|
194
|
+
error.Overflow => val: {
|
|
195
|
+
r.reduce();
|
|
196
|
+
s.reduce();
|
|
197
|
+
break :val try std.math.add(T, r.p, s.p);
|
|
198
|
+
},
|
|
199
|
+
else => unreachable,
|
|
200
|
+
};
|
|
201
|
+
} else {
|
|
202
|
+
addition(T, r, s.p, s.q) catch |err| switch (err) {
|
|
203
|
+
error.Overflow => {
|
|
204
|
+
r.reduce();
|
|
205
|
+
s.reduce();
|
|
206
|
+
try addition(T, r, s.p, s.q);
|
|
207
|
+
},
|
|
208
|
+
else => unreachable,
|
|
209
|
+
};
|
|
210
|
+
}
|
|
211
|
+
},
|
|
212
|
+
Float => {
|
|
213
|
+
if (r.q == s.q) {
|
|
214
|
+
if (r.p > o) r.reduce();
|
|
215
|
+
if (s.p > o) s.reduce();
|
|
216
|
+
|
|
217
|
+
r.p += s.p;
|
|
217
218
|
} else {
|
|
218
|
-
|
|
219
|
-
|
|
219
|
+
// Always reduce to minimize loss of precision from the multiplications
|
|
220
|
+
r.reduce();
|
|
221
|
+
s.reduce();
|
|
222
|
+
|
|
223
|
+
r.p = (r.p * s.q) + (r.q * s.p);
|
|
224
|
+
r.q *= s.q;
|
|
220
225
|
}
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
226
|
+
|
|
227
|
+
assert(std.math.modf(r.p).fpart == 0);
|
|
228
|
+
assert(std.math.modf(r.q).fpart == 0);
|
|
229
|
+
},
|
|
230
|
+
else => unreachable,
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
|
|
234
|
+
fn mul_(comptime T: type, comptime o: comptime_int, r: anytype, s: anytype) !void {
|
|
235
|
+
switch (@typeInfo(T)) {
|
|
236
|
+
Int => {
|
|
237
|
+
multiplication(T, r, s.p, s.q) catch |err| switch (err) {
|
|
238
|
+
error.Overflow => {
|
|
239
|
+
r.reduce();
|
|
240
|
+
s.reduce();
|
|
241
|
+
try multiplication(T, r, s.p, s.q);
|
|
242
|
+
},
|
|
243
|
+
else => unreachable,
|
|
244
|
+
};
|
|
245
|
+
},
|
|
246
|
+
Float => {
|
|
247
|
+
if (r.q > o or r.p > o) r.reduce();
|
|
248
|
+
if (s.q > o or s.p > o) s.reduce();
|
|
249
|
+
|
|
250
|
+
r.p *= s.p;
|
|
251
|
+
r.q *= s.q;
|
|
252
|
+
|
|
253
|
+
assert(std.math.modf(r.p).fpart == 0);
|
|
254
|
+
assert(std.math.modf(r.q).fpart == 0);
|
|
255
|
+
},
|
|
256
|
+
else => unreachable,
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
fn cmp_(comptime T: type, comptime o: comptime_int, r: anytype, s: anytype) !std.math.Order {
|
|
261
|
+
switch (@typeInfo(T)) {
|
|
262
|
+
Int => {
|
|
263
|
+
const ad = std.math.mul(T, r.p, s.q) catch |err| switch (err) {
|
|
264
|
+
error.Overflow => ad: {
|
|
265
|
+
r.reduce();
|
|
266
|
+
s.reduce();
|
|
267
|
+
break :ad try std.math.mul(T, r.p, s.q);
|
|
268
|
+
},
|
|
269
|
+
else => unreachable,
|
|
270
|
+
};
|
|
271
|
+
const bc = std.math.mul(T, r.q, s.p) catch |err| switch (err) {
|
|
272
|
+
error.Overflow => bc: {
|
|
273
|
+
r.reduce();
|
|
274
|
+
s.reduce();
|
|
275
|
+
break :bc try std.math.mul(T, r.q, s.p);
|
|
276
|
+
},
|
|
277
|
+
else => unreachable,
|
|
278
|
+
};
|
|
279
|
+
|
|
280
|
+
return std.math.order(ad, bc);
|
|
281
|
+
},
|
|
282
|
+
Float => {
|
|
283
|
+
if (r.q > o or r.p > o) r.reduce();
|
|
284
|
+
if (s.q > o or s.p > o) s.reduce();
|
|
285
|
+
|
|
286
|
+
const ad: T = r.p * s.q;
|
|
287
|
+
const bc: T = r.q * s.p;
|
|
288
|
+
|
|
289
|
+
return std.math.order(ad, bc);
|
|
290
|
+
},
|
|
291
|
+
else => unreachable,
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
|
|
295
|
+
fn reduce_(r: anytype) void {
|
|
296
|
+
const d = gcd(r.p, r.q);
|
|
297
|
+
if (d == 1) return;
|
|
298
|
+
|
|
299
|
+
assert(@mod(r.p, d) == 0);
|
|
300
|
+
assert(@mod(r.q, d) == 0);
|
|
301
|
+
|
|
302
|
+
r.p /= d;
|
|
303
|
+
r.q /= d;
|
|
304
|
+
|
|
305
|
+
assert(r.p >= 1);
|
|
306
|
+
assert(r.q >= 1);
|
|
307
|
+
}
|
|
308
|
+
|
|
309
|
+
fn multiplication(comptime T: type, r: anytype, p: anytype, q: anytype) !void {
|
|
310
|
+
r.p = try std.math.mul(T, r.p, p);
|
|
311
|
+
r.q = try std.math.mul(T, r.q, q);
|
|
312
|
+
}
|
|
313
|
+
|
|
314
|
+
fn addition(comptime T: type, r: anytype, p: anytype, q: anytype) !void {
|
|
315
|
+
// (a/b) + (c/d) = (ad+bc)/(bd)
|
|
316
|
+
const bd = try std.math.mul(T, r.q, q);
|
|
317
|
+
const ad = try std.math.mul(T, r.p, q);
|
|
318
|
+
const bc = try std.math.mul(T, r.q, p);
|
|
319
|
+
|
|
320
|
+
r.p = try std.math.add(T, ad, bc);
|
|
321
|
+
r.q = bd;
|
|
322
|
+
}
|
|
323
|
+
|
|
324
|
+
fn gcd(p: anytype, q: anytype) @TypeOf(p, q) {
|
|
325
|
+
assert(p >= 1);
|
|
326
|
+
assert(q >= 1);
|
|
327
|
+
|
|
328
|
+
// convert comptime_int to a sized integer within this function so that @ctz will work
|
|
329
|
+
const T = switch (@TypeOf(p, q)) {
|
|
330
|
+
comptime_int => std.math.IntFittingRange(@min(p, q), @max(p, q)),
|
|
331
|
+
else => |U| U,
|
|
332
|
+
};
|
|
333
|
+
|
|
334
|
+
switch (@typeInfo(T)) {
|
|
335
|
+
Int => {
|
|
336
|
+
// std.math.gcd but without some checks because we have a stricter range
|
|
337
|
+
var x: T = @intCast(p);
|
|
338
|
+
var y: T = @intCast(q);
|
|
339
|
+
|
|
340
|
+
const xz = @ctz(x);
|
|
341
|
+
const yz = @ctz(y);
|
|
342
|
+
const shift = @min(xz, yz);
|
|
343
|
+
x >>= @intCast(xz);
|
|
344
|
+
y >>= @intCast(yz);
|
|
345
|
+
|
|
346
|
+
var diff = y -% x;
|
|
347
|
+
while (diff != 0) : (diff = y -% x) {
|
|
348
|
+
const zeros = @ctz(diff);
|
|
349
|
+
if (x > y) diff = -%diff;
|
|
350
|
+
y = @min(x, y);
|
|
351
|
+
x = diff >> @intCast(zeros);
|
|
241
352
|
}
|
|
242
353
|
|
|
243
|
-
const result =
|
|
354
|
+
const result = y << @intCast(shift);
|
|
244
355
|
assert(result > 0);
|
|
245
356
|
return result;
|
|
246
357
|
},
|
|
@@ -263,7 +374,7 @@ fn gcd(p: anytype, q: anytype) @TypeOf(p, q) {
|
|
|
263
374
|
|
|
264
375
|
test gcd {
|
|
265
376
|
const seed = if (@hasDecl(std.testing, "random_seed")) std.testing.random_seed else 0x12345678;
|
|
266
|
-
var prng = std.Random.DefaultPrng.init(seed);
|
|
377
|
+
var prng = (if (@hasDecl(std, "Random")) std.Random else std.rand).DefaultPrng.init(seed);
|
|
267
378
|
var random = prng.random();
|
|
268
379
|
|
|
269
380
|
for (0..1000) |_| {
|
|
@@ -276,6 +387,8 @@ test gcd {
|
|
|
276
387
|
@as(u32, @intFromFloat(gcd(@as(f64, @floatFromInt(a)), @as(f64, @floatFromInt(b))))),
|
|
277
388
|
);
|
|
278
389
|
}
|
|
390
|
+
|
|
391
|
+
try expectEqual(gcd(300_000, @as(u32, 2_300_000)), 100_000); // NB: @ctz requires an @intCast
|
|
279
392
|
}
|
|
280
393
|
|
|
281
394
|
fn doTurn(r: anytype) !void {
|
|
@@ -287,8 +400,9 @@ fn doTurn(r: anytype) !void {
|
|
|
287
400
|
}
|
|
288
401
|
|
|
289
402
|
test Rational {
|
|
290
|
-
inline for (.{ u64, u128, f64 }) |t| {
|
|
291
|
-
|
|
403
|
+
inline for (.{ u64, u128, u256, f64 }) |t| {
|
|
404
|
+
const R = Rational(t);
|
|
405
|
+
var r: R = .{};
|
|
292
406
|
|
|
293
407
|
var c: t = 128;
|
|
294
408
|
_ = &c;
|
|
@@ -297,7 +411,7 @@ test Rational {
|
|
|
297
411
|
try doTurn(&r);
|
|
298
412
|
|
|
299
413
|
r.reduce();
|
|
300
|
-
try expectEqual(
|
|
414
|
+
try expectEqual(R{ .p = 75383, .q = 35550920704 }, r);
|
|
301
415
|
|
|
302
416
|
try r.update(1, 4);
|
|
303
417
|
if (t == u64) {
|
|
@@ -305,143 +419,42 @@ test Rational {
|
|
|
305
419
|
} else {
|
|
306
420
|
try doTurn(&r);
|
|
307
421
|
r.reduce();
|
|
308
|
-
try expectEqual(
|
|
422
|
+
try expectEqual(R{ .p = 5682596689, .q = 2527735925804191711232 }, r);
|
|
309
423
|
}
|
|
310
424
|
|
|
311
425
|
r.reset();
|
|
312
426
|
|
|
313
|
-
var s =
|
|
427
|
+
var s = R{ .p = 10, .q = 13 };
|
|
314
428
|
try r.mul(&s);
|
|
315
|
-
s =
|
|
429
|
+
s = R{ .p = 3, .q = 4 };
|
|
316
430
|
try r.mul(&s);
|
|
317
|
-
try expectEqual(
|
|
431
|
+
try expectEqual(R{ .p = 30, .q = 52 }, r);
|
|
318
432
|
|
|
319
|
-
s =
|
|
433
|
+
s = R{ .p = 1, .q = 3 };
|
|
320
434
|
try r.add(&s);
|
|
321
435
|
r.reduce();
|
|
322
|
-
try expectEqual(
|
|
323
|
-
}
|
|
324
|
-
}
|
|
325
|
-
|
|
326
|
-
/// Adapter of std.math.big.Rational to the engines Rational interface.
|
|
327
|
-
pub const BigRational = struct {
|
|
328
|
-
/// The underlying rational number.
|
|
329
|
-
val: std.math.big.Rational,
|
|
436
|
+
try expectEqual(R{ .p = 71, .q = 78 }, r);
|
|
330
437
|
|
|
331
|
-
|
|
332
|
-
|
|
438
|
+
var u = R{ .p = 3, .q = 5 };
|
|
439
|
+
var v = R{ .p = 2, .q = 5 };
|
|
440
|
+
try expectEqual(u.cmp(&v), .gt);
|
|
441
|
+
v = R{ .p = 4, .q = 5 };
|
|
442
|
+
try expectEqual(u.cmp(&v), .lt);
|
|
333
443
|
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
}
|
|
339
|
-
|
|
340
|
-
/// Frees all memory associated with a rational.
|
|
341
|
-
pub fn deinit(r: *BigRational) void {
|
|
342
|
-
r.val.deinit();
|
|
343
|
-
}
|
|
344
|
-
|
|
345
|
-
/// Resets the rational back to 1.
|
|
346
|
-
pub fn reset(r: *BigRational) !void {
|
|
347
|
-
try r.val.setInt(1);
|
|
348
|
-
}
|
|
444
|
+
v = R{ .p = 3, .q = 6 };
|
|
445
|
+
try expectEqual(u.cmp(&v), .gt);
|
|
446
|
+
v = R{ .p = 3, .q = 4 };
|
|
447
|
+
try expectEqual(u.cmp(&v), .lt);
|
|
349
448
|
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
pub fn update(r: *BigRational, p: anytype, q: anytype) !void {
|
|
353
|
-
assert(p >= 1);
|
|
354
|
-
assert(q >= 1);
|
|
449
|
+
v = R{ .p = 3, .q = 5 };
|
|
450
|
+
try expectEqual(u.cmp(&v), .eq);
|
|
355
451
|
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
/// Adds two rationals.
|
|
363
|
-
pub fn add(r: *BigRational, s: *const BigRational) !void {
|
|
364
|
-
try r.val.add(r.val, s.val);
|
|
365
|
-
}
|
|
366
|
-
|
|
367
|
-
/// Multiplies two rationals.
|
|
368
|
-
pub fn mul(r: *BigRational, s: *const BigRational) !void {
|
|
369
|
-
try r.val.mul(r.val, s.val);
|
|
370
|
-
}
|
|
371
|
-
};
|
|
372
|
-
|
|
373
|
-
test BigRational {
|
|
374
|
-
var r = try BigRational.init(std.testing.allocator);
|
|
375
|
-
defer r.deinit();
|
|
376
|
-
var s = try std.math.big.Rational.init(std.testing.allocator);
|
|
377
|
-
defer s.deinit();
|
|
378
|
-
|
|
379
|
-
try r.reset();
|
|
380
|
-
|
|
381
|
-
var c: u8 = 128;
|
|
382
|
-
_ = &c;
|
|
383
|
-
|
|
384
|
-
try r.update(c, 256);
|
|
385
|
-
try doTurn(&r);
|
|
386
|
-
|
|
387
|
-
try s.setRatio(75383, 35550920704);
|
|
388
|
-
try expect((try s.order(r.val)) == .eq);
|
|
389
|
-
|
|
390
|
-
try r.update(1, 4);
|
|
391
|
-
try doTurn(&r);
|
|
392
|
-
|
|
393
|
-
try s.setRatio(5682596689, 2527735925804191711232);
|
|
394
|
-
try expect((try s.order(r.val)) == .eq);
|
|
395
|
-
|
|
396
|
-
try r.reset();
|
|
397
|
-
|
|
398
|
-
var t = try BigRational.init(std.testing.allocator);
|
|
399
|
-
defer t.deinit();
|
|
400
|
-
|
|
401
|
-
try t.val.setRatio(10, 13);
|
|
402
|
-
try r.mul(&t);
|
|
403
|
-
try t.val.setRatio(3, 4);
|
|
404
|
-
try r.mul(&t);
|
|
405
|
-
|
|
406
|
-
try s.setRatio(15, 26);
|
|
407
|
-
try expect((try s.order(r.val)) == .eq);
|
|
408
|
-
|
|
409
|
-
try t.val.setRatio(1, 3);
|
|
410
|
-
try r.add(&t);
|
|
411
|
-
|
|
412
|
-
try s.setRatio(71, 78);
|
|
413
|
-
try expect((try s.order(r.val)) == .eq);
|
|
414
|
-
}
|
|
415
|
-
|
|
416
|
-
test "minimum" {
|
|
417
|
-
// TODO: ziglang/zig#21069
|
|
418
|
-
if (builtin.mode == .ReleaseFast or builtin.mode == .ReleaseSmall) {
|
|
419
|
-
return error.SkipZigTest;
|
|
420
|
-
}
|
|
421
|
-
var r = try BigRational.init(std.testing.allocator);
|
|
422
|
-
defer r.deinit();
|
|
423
|
-
var s = try std.math.big.Rational.init(std.testing.allocator);
|
|
424
|
-
defer s.deinit();
|
|
425
|
-
|
|
426
|
-
try r.reset();
|
|
427
|
-
|
|
428
|
-
try r.update(1, 2); // Speed Tie
|
|
429
|
-
for (0..2) |_| {
|
|
430
|
-
try r.update(1, 2); // Confusion
|
|
431
|
-
try r.update(1, 2); // Infatuation
|
|
432
|
-
try r.update(3, 4); // Paralysis
|
|
433
|
-
// Population Bomb
|
|
434
|
-
for (0..10) |_| {
|
|
435
|
-
try r.update(9, 10); // Accuracy
|
|
436
|
-
try r.update(1, 15); // Damage roll
|
|
437
|
-
try r.update(1, 24); // Critical Hit
|
|
438
|
-
try r.update(9, 10); // King's Rock non-proc
|
|
452
|
+
try doTurn(&u);
|
|
453
|
+
v = R{ .p = 4567216874, .q = 89124781931235 };
|
|
454
|
+
if (t == u64) {
|
|
455
|
+
try expectEqual(u.cmp(&v), error.Overflow);
|
|
456
|
+
} else {
|
|
457
|
+
try expectEqual(u.cmp(&v), .lt);
|
|
439
458
|
}
|
|
440
459
|
}
|
|
441
|
-
|
|
442
|
-
const ZEROS = std.math.pow(u310, 10, 31);
|
|
443
|
-
const n = 36472996377170786403;
|
|
444
|
-
const d: u310 = 146267071761884981524886149560653378220687632500762654519853056 * ZEROS;
|
|
445
|
-
try s.setRatio(n, d);
|
|
446
|
-
try expect((try s.order(r.val)) == .eq);
|
|
447
460
|
}
|