@pkmn/engine 0.1.0-dev.645b4750 → 0.1.0-dev.6ba42cd5

package/src/lib/common/rational.zig

@@ -6,13 +6,6 @@ const expect = std.testing.expect;
 const expectEqual = std.testing.expectEqual;
 const expectError = std.testing.expectError;
 
-const Int = if (@hasField(std.builtin.Type, "int")) .int else .Int;
-const Float = if (@hasField(std.builtin.Type, "float")) .float else .Float;
-const ComptimeInt =
-    if (@hasField(std.builtin.Type, "comptime_int")) .comptime_int else .ComptimeInt;
-const ComptimeFloat =
-    if (@hasField(std.builtin.Type, "comptime_float")) .comptime_float else .ComptimeFloat;
-
 /// Specialization of a rational number used by the engine to compute probabilties.
 /// For performance reasons the rational is only reduced lazily and thus `reduce` must be
 /// invoked explicitly before reading. Note that this laziness means that this implementation
@@ -23,14 +16,14 @@ pub fn Rational(comptime T: type) type {
     // instead start reducing when we get sufficiently close to the limit of the mantissa
     // (in our domain we expect updates to involve numbers < 2**10, so we should be safe
     // not reducing before we are 2**10 away from "overflowing" the mantissa)
-    const o = if (@typeInfo(T) == Float)
+    const o = if (@typeInfo(T) == .float)
         std.math.pow(T, 2, std.math.floatMantissaBits(T) - 10)
     else
         0;
 
     const Err = switch (@typeInfo(T)) {
-        Int => error{Overflow},
-        Float => error{},
+        .int => error{Overflow},
+        .float => error{},
         else => unreachable,
     };
 
@@ -68,18 +61,17 @@ pub fn Rational(comptime T: type) type {
             return mul_(T, o, r, s);
         }
 
+        /// Compares two rationals using the identity (a/b) > (c/d) => ad > bc
+        pub fn cmp(r: *Self, s: anytype) Error!std.math.Order {
+            return cmp_(T, o, r, s);
+        }
+
         /// Normalize the rational by reducing by the greatest common divisor.
         pub fn reduce(r: *Self) void {
             reduce_(r);
         }
 
-        pub fn format(
-            self: Self,
-            comptime fmt: []const u8,
-            opts: std.fmt.FormatOptions,
-            writer: anytype,
-        ) !void {
-            _ = .{ fmt, opts };
+        pub fn format(self: Self, writer: *std.Io.Writer) !void {
             try writer.print("{d}/{d}", .{ self.p, self.q });
         }
     } else struct {
@@ -115,18 +107,17 @@ pub fn Rational(comptime T: type) type {
             return mul_(T, o, r, s);
         }
 
+        /// Compares two rationals using the identity (a/b) > (c/d) => ad > bc
+        pub fn cmp(r: *Self, s: anytype) Error!std.math.Order {
+            return cmp_(T, o, r, s);
+        }
+
         /// Normalize the rational by reducing by the greatest common divisor.
         pub fn reduce(r: *Self) void {
             reduce_(r);
         }
 
-        pub fn format(
-            self: Self,
-            comptime fmt: []const u8,
-            opts: std.fmt.FormatOptions,
-            writer: anytype,
-        ) !void {
-            _ = .{ fmt, opts };
+        pub fn format(self: Self, writer: *std.Io.Writer) !void {
             try writer.print("{d}/{d}", .{ self.p, self.q });
         }
     };
@@ -140,12 +131,12 @@ fn update_(comptime T: type, comptime o: comptime_int, r: anytype, p: anytype, q
     // If our parameters are not fully reduced they may prematurely
     // cause overflow/loss of precision after the multiplication below
     assert(switch (@typeInfo(@TypeOf(p, q))) {
-        ComptimeInt, ComptimeFloat => comptime gcd(p, q),
+        .comptime_int, .comptime_float => comptime gcd(p, q),
         else => 1,
     } == 1);
 
     switch (@typeInfo(T)) {
-        Int => {
+        .int => {
             // Greedily attempt to multiply and if it fails, reduce and try again
             multiplication(T, r, p, q) catch |err| switch (err) {
                 error.Overflow => {
@@ -155,16 +146,16 @@ fn update_(comptime T: type, comptime o: comptime_int, r: anytype, p: anytype, q
                 else => unreachable,
             };
         },
-        Float => {
+        .float => {
             // Reduce in situations where we're likely to start losing precision
             if (r.q > o or r.p > o) r.reduce();
 
             r.p *= switch (@typeInfo(@TypeOf(p))) {
-                Float, ComptimeFloat => p,
+                .float, .comptime_float => p,
                 else => @floatFromInt(p),
             };
             r.q *= switch (@typeInfo(@TypeOf(q))) {
-                Float, ComptimeFloat => q,
+                .float, .comptime_float => q,
                 else => @floatFromInt(q),
             };
 
@@ -178,7 +169,7 @@ fn update_(comptime T: type, comptime o: comptime_int, r: anytype, p: anytype, q
 
 fn add_(comptime T: type, comptime o: comptime_int, r: anytype, s: anytype) !void {
     switch (@typeInfo(T)) {
-        Int => {
+        .int => {
             if (r.q == s.q) {
                 r.p = std.math.add(T, r.p, s.p) catch |err| switch (err) {
                     error.Overflow => val: {
@@ -199,7 +190,7 @@ fn add_(comptime T: type, comptime o: comptime_int, r: anytype, s: anytype) !voi
                 };
             }
         },
-        Float => {
+        .float => {
             if (r.q == s.q) {
                 if (r.p > o) r.reduce();
                 if (s.p > o) s.reduce();
@@ -223,7 +214,7 @@ fn add_(comptime T: type, comptime o: comptime_int, r: anytype, s: anytype) !voi
 
 fn mul_(comptime T: type, comptime o: comptime_int, r: anytype, s: anytype) !void {
     switch (@typeInfo(T)) {
-        Int => {
+        .int => {
             multiplication(T, r, s.p, s.q) catch |err| switch (err) {
                 error.Overflow => {
                     r.reduce();
@@ -233,7 +224,7 @@ fn mul_(comptime T: type, comptime o: comptime_int, r: anytype, s: anytype) !voi
                 else => unreachable,
             };
         },
-        Float => {
+        .float => {
             if (r.q > o or r.p > o) r.reduce();
             if (s.q > o or s.p > o) s.reduce();
 
@@ -247,6 +238,41 @@ fn mul_(comptime T: type, comptime o: comptime_int, r: anytype, s: anytype) !voi
     }
 }
 
+fn cmp_(comptime T: type, comptime o: comptime_int, r: anytype, s: anytype) !std.math.Order {
+    switch (@typeInfo(T)) {
+        .int => {
+            const ad = std.math.mul(T, r.p, s.q) catch |err| switch (err) {
+                error.Overflow => ad: {
+                    r.reduce();
+                    s.reduce();
+                    break :ad try std.math.mul(T, r.p, s.q);
+                },
+                else => unreachable,
+            };
+            const bc = std.math.mul(T, r.q, s.p) catch |err| switch (err) {
+                error.Overflow => bc: {
+                    r.reduce();
+                    s.reduce();
+                    break :bc try std.math.mul(T, r.q, s.p);
+                },
+                else => unreachable,
+            };
+
+            return std.math.order(ad, bc);
+        },
+        .float => {
+            if (r.q > o or r.p > o) r.reduce();
+            if (s.q > o or s.p > o) s.reduce();
+
+            const ad: T = r.p * s.q;
+            const bc: T = r.q * s.p;
+
+            return std.math.order(ad, bc);
+        },
+        else => unreachable,
+    }
+}
+
 fn reduce_(r: anytype) void {
     const d = gcd(r.p, r.q);
     if (d == 1) return;
@@ -268,12 +294,12 @@ fn multiplication(comptime T: type, r: anytype, p: anytype, q: anytype) !void {
 
 fn addition(comptime T: type, r: anytype, p: anytype, q: anytype) !void {
     // (a/b) + (c/d) = (ad+bc)/(bd)
-    const d = try std.math.mul(T, r.q, q);
-    const n1 = try std.math.mul(T, r.p, q);
-    const n2 = try std.math.mul(T, r.q, p);
+    const bd = try std.math.mul(T, r.q, q);
+    const ad = try std.math.mul(T, r.p, q);
+    const bc = try std.math.mul(T, r.q, p);
 
-    r.p = try std.math.add(T, n1, n2);
-    r.q = d;
+    r.p = try std.math.add(T, ad, bc);
+    r.q = bd;
 }
 
 fn gcd(p: anytype, q: anytype) @TypeOf(p, q) {
@@ -287,7 +313,7 @@ fn gcd(p: anytype, q: anytype) @TypeOf(p, q) {
     };
 
     switch (@typeInfo(T)) {
-        Int => {
+        .int => {
             // std.math.gcd but without some checks because we have a stricter range
             var x: T = @intCast(p);
             var y: T = @intCast(q);
@@ -328,8 +354,7 @@ fn gcd(p: anytype, q: anytype) @TypeOf(p, q) {
 }
 
 test gcd {
-    const seed = if (@hasDecl(std.testing, "random_seed")) std.testing.random_seed else 0x12345678;
-    var prng = (if (@hasDecl(std, "Random")) std.Random else std.rand).DefaultPrng.init(seed);
+    var prng = std.Random.DefaultPrng.init(std.testing.random_seed);
     var random = prng.random();
 
     for (0..1000) |_| {
@@ -356,7 +381,8 @@ fn doTurn(r: anytype) !void {
 
 test Rational {
     inline for (.{ u64, u128, u256, f64 }) |t| {
-        var r: Rational(t) = .{};
+        const R = Rational(t);
+        var r: R = .{};
 
         var c: t = 128;
         _ = &c;
@@ -365,7 +391,7 @@ test Rational {
         try doTurn(&r);
 
         r.reduce();
-        try expectEqual(Rational(t){ .p = 75383, .q = 35550920704 }, r);
+        try expectEqual(R{ .p = 75383, .q = 35550920704 }, r);
 
         try r.update(1, 4);
         if (t == u64) {
@@ -373,150 +399,42 @@ test Rational {
         } else {
             try doTurn(&r);
             r.reduce();
-            try expectEqual(Rational(t){ .p = 5682596689, .q = 2527735925804191711232 }, r);
+            try expectEqual(R{ .p = 5682596689, .q = 2527735925804191711232 }, r);
         }
 
         r.reset();
 
-        var s = Rational(t){ .p = 10, .q = 13 };
+        var s = R{ .p = 10, .q = 13 };
         try r.mul(&s);
-        s = Rational(t){ .p = 3, .q = 4 };
+        s = R{ .p = 3, .q = 4 };
         try r.mul(&s);
-        try expectEqual(Rational(t){ .p = 30, .q = 52 }, r);
+        try expectEqual(R{ .p = 30, .q = 52 }, r);
 
-        s = Rational(t){ .p = 1, .q = 3 };
+        s = R{ .p = 1, .q = 3 };
         try r.add(&s);
         r.reduce();
-        try expectEqual(Rational(t){ .p = 71, .q = 78 }, r);
-    }
-}
+        try expectEqual(R{ .p = 71, .q = 78 }, r);
 
-/// Adapter of std.math.big.Rational to the engines Rational interface.
-pub const BigRational = struct {
-    /// The underlying rational number.
-    val: std.math.big.Rational,
+        var u = R{ .p = 3, .q = 5 };
+        var v = R{ .p = 2, .q = 5 };
+        try expectEqual(u.cmp(&v), .gt);
+        v = R{ .p = 4, .q = 5 };
+        try expectEqual(u.cmp(&v), .lt);
 
-    /// Possible error returned by operations on the rational.
-    pub const Error = error{OutOfMemory};
+        v = R{ .p = 3, .q = 6 };
+        try expectEqual(u.cmp(&v), .gt);
+        v = R{ .p = 3, .q = 4 };
+        try expectEqual(u.cmp(&v), .lt);
 
-    /// Create a new BigRational wrapper.  A small amount of memory will be allocated on
-    /// initialization. Not default initialized to 1 - you must explicitly `reset` first.
-    pub fn init(alloc: std.mem.Allocator) !BigRational {
-        return .{ .val = try std.math.big.Rational.init(alloc) };
-    }
+        v = R{ .p = 3, .q = 5 };
+        try expectEqual(u.cmp(&v), .eq);
 
-    /// Frees all memory associated with a rational.
-    pub fn deinit(r: *BigRational) void {
-        r.val.deinit();
-    }
-
-    /// Resets the rational back to 1.
-    pub fn reset(r: *BigRational) !void {
-        try r.val.setInt(1);
-    }
-
-    /// Update the rational by multiplying its numerator by p and its denominator by q.
-    /// Both p and q must be >= 1.
-    pub fn update(r: *BigRational, p: anytype, q: anytype) !void {
-        assert(p >= 1);
-        assert(q >= 1);
-
-        var s = try std.math.big.Rational.init(r.val.p.allocator);
-        defer s.deinit();
-        try s.setRatio(p, q);
-        try r.val.mul(r.val, s);
-    }
-
-    /// Adds two rationals.
-    pub fn add(r: *BigRational, s: anytype) !void {
-        if (@hasField(@TypeOf(s.*), "val")) {
-            try r.val.add(r.val, s.val);
+        try doTurn(&u);
+        v = R{ .p = 4567216874, .q = 89124781931235 };
+        if (t == u64) {
+            try expectEqual(u.cmp(&v), error.Overflow);
         } else {
-            var t = try std.math.big.Rational.init(r.val.p.allocator);
-            defer t.deinit();
-            try t.setRatio(s.p, s.q);
-            try r.val.add(r.val, t);
+            try expectEqual(u.cmp(&v), .lt);
         }
     }
-
-    /// Multiplies two rationals.
-    pub fn mul(r: *BigRational, s: *const BigRational) !void {
-        try r.val.mul(r.val, s.val);
-    }
-};
-
-test BigRational {
-    var r = try BigRational.init(std.testing.allocator);
-    defer r.deinit();
-    var s = try std.math.big.Rational.init(std.testing.allocator);
-    defer s.deinit();
-
-    try r.reset();
-
-    var c: u8 = 128;
-    _ = &c;
-
-    try r.update(c, 256);
-    try doTurn(&r);
-
-    try s.setRatio(75383, 35550920704);
-    try expect((try s.order(r.val)) == .eq);
-
-    try r.update(1, 4);
-    try doTurn(&r);
-
-    try s.setRatio(5682596689, 2527735925804191711232);
-    try expect((try s.order(r.val)) == .eq);
-
-    try r.reset();
-
-    var t = try BigRational.init(std.testing.allocator);
-    defer t.deinit();
-
-    try t.val.setRatio(10, 13);
-    try r.mul(&t);
-    try t.val.setRatio(3, 4);
-    try r.mul(&t);
-
-    try s.setRatio(15, 26);
-    try expect((try s.order(r.val)) == .eq);
-
-    try t.val.setRatio(1, 3);
-    try r.add(&t);
-
-    try s.setRatio(71, 78);
-    try expect((try s.order(r.val)) == .eq);
-}
-
-test "minimum" {
-    // TODO: ziglang/zig#21069
-    if (builtin.mode == .ReleaseFast or builtin.mode == .ReleaseSmall) {
-        return error.SkipZigTest;
-    }
-    var r = try BigRational.init(std.testing.allocator);
-    defer r.deinit();
-    var s = try std.math.big.Rational.init(std.testing.allocator);
-    defer s.deinit();
-
-    try r.reset();
-
-    try r.update(1, 2); // Speed Tie
-    for (0..2) |_| {
-        try r.update(1, 2); // Confusion
-        try r.update(1, 2); // Infatuation
-        try r.update(3, 4); // Paralysis
-        // Population Bomb
-        for (0..10) |_| {
-            try r.update(9, 10); // Accuracy
-            try r.update(1, 15); // Damage roll
-            try r.update(1, 24); // Critical Hit
-            try r.update(9, 10); // King's Rock non-proc
-        }
-    }
-
-    const ZEROS = std.math.pow(u310, 10, 31);
-    const n = 36472996377170786403;
-    const d: u310 = 146267071761884981524886149560653378220687632500762654519853056 * ZEROS;
-    try s.setRatio(n, d);
-    try expect((try s.order(r.val)) == .eq);
 }

package/src/lib/common/util.zig

@@ -3,11 +3,8 @@ const std = @import("std");
 const expect = std.testing.expect;
 const expectEqual = std.testing.expectEqual;
 
-const Pointer = if (@hasField(std.builtin.Type, "pointer")) .pointer else .Pointer;
-const One = if (@hasField(std.builtin.Type.Pointer.Size, "one")) .one else .One;
-
 pub fn PointerType(comptime P: type, comptime C: type) type {
-    return if (@field(@typeInfo(P), @tagName(Pointer)).is_const) *const C else *C;
+    return if (@typeInfo(P).pointer.is_const) *const C else *C;
 }
 
 test PointerType {
@@ -18,7 +15,7 @@ test PointerType {
 pub fn isPointerTo(p: anytype, comptime P: type) bool {
     const info = @typeInfo(@TypeOf(p));
     return switch (info) {
-        Pointer => @field(info, @tagName(Pointer)).child == P,
+        .pointer => info.pointer.child == P,
         else => false,
     };
 }
@@ -30,47 +27,18 @@ test isPointerTo {
     try expect(isPointerTo(&s, S));
 }
 
-// NOTE: std.mem.bytesAsValue backported from ziglang/zig#18061
-pub fn bytesAsValue(comptime T: type, bytes: anytype) BytesAsValueReturnType(T, @TypeOf(bytes)) {
-    return @as(BytesAsValueReturnType(T, @TypeOf(bytes)), @ptrCast(bytes));
-}
-
-fn BytesAsValueReturnType(comptime T: type, comptime B: type) type {
-    return CopyPtrAttrs(B, One, T);
-}
+pub fn repeat(comptime xs: anytype, comptime n: usize) [xs.len * n]@TypeOf(xs[0]) {
+    comptime {
+        const T = @TypeOf(xs[0]);
+        var ts: [xs.len * n]T = undefined;
 
-fn CopyPtrAttrs(
-    comptime source: type,
-    comptime size: std.builtin.Type.Pointer.Size,
-    comptime child: type,
-) type {
-    const info = @field(@typeInfo(source), @tagName(Pointer));
-    const args: std.builtin.Type.Pointer = if (@hasField(std.builtin.Type.Pointer, "sentinel")) .{
-        .size = size,
-        .is_const = info.is_const,
-        .is_volatile = info.is_volatile,
-        .is_allowzero = info.is_allowzero,
-        .alignment = info.alignment,
-        .address_space = info.address_space,
-        .child = child,
-        .sentinel = null,
-    } else .{
-        .size = size,
-        .is_const = info.is_const,
-        .is_volatile = info.is_volatile,
-        .is_allowzero = info.is_allowzero,
-        .alignment = info.alignment,
-        .address_space = info.address_space,
-        .child = child,
-        .sentinel_ptr = null,
-    };
-    return @Type(if (@hasField(std.builtin.Type, "pointer"))
-        .{ .pointer = args }
-    else
-        .{ .Pointer = args });
-}
+        var i: usize = 0;
+        while (i < n) : (i += 1) {
+            for (xs, 0..) |v, j| {
+                ts[i * xs.len + j] = v;
+            }
+        }
 
-// NOTE: std.meta.FieldType replaced by @FieldType in 0.14.0
-pub fn FieldType(comptime T: type, comptime field: std.meta.FieldEnum(T)) type {
-    return std.meta.fieldInfo(T, field).type;
+        return ts;
+    }
 }