adrien/zig-dimal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Prevent convertion if unecessary at comptime for Quantity operations

Browse Source
This commit is contained in:
adrien 2026-04-21 17:55:33 +02:00
parent a16bbedbd8
commit b02665fe89
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Quantity.zig
View File

@ -26,12 +26,14 @@ pub fn Quantity(comptime T: type, comptime d: Dimensions, comptime s: Scales) ty
) { ) {
if (comptime !dims.eql(@TypeOf(rhs).dims)) if (comptime !dims.eql(@TypeOf(rhs).dims))
@compileError("Dimension mismatch in add: " ++ dims.str() ++ " vs " ++ @TypeOf(rhs).dims.str()); @compileError("Dimension mismatch in add: " ++ dims.str() ++ " vs " ++ @TypeOf(rhs).dims.str());
if (comptime @TypeOf(rhs) == Self)
return .{ .value = self.value + rhs.value };
const TargetType = Quantity(T, dims, scales.min(@TypeOf(rhs).scales)); const TargetType = Quantity(T, dims, scales.min(@TypeOf(rhs).scales));
const lhs_converted = self.to(TargetType); const lhs_val = if (comptime @TypeOf(self) == TargetType) self.value else self.to(TargetType).value;
const rhs_converted = rhs.to(TargetType); const rhs_val = if (comptime @TypeOf(rhs) == TargetType) rhs.value else rhs.to(TargetType).value;
return .{ .value = lhs_converted.value + rhs_converted.value }; return .{ .value = lhs_val + rhs_val };
} }
pub inline fn sub(self: Self, rhs: anytype) Quantity( pub inline fn sub(self: Self, rhs: anytype) Quantity(
@ -41,12 +43,14 @@ pub fn Quantity(comptime T: type, comptime d: Dimensions, comptime s: Scales) ty
) { ) {
if (comptime !dims.eql(@TypeOf(rhs).dims)) if (comptime !dims.eql(@TypeOf(rhs).dims))
@compileError("Dimension mismatch in sub: " ++ dims.str() ++ " vs " ++ @TypeOf(rhs).dims.str()); @compileError("Dimension mismatch in sub: " ++ dims.str() ++ " vs " ++ @TypeOf(rhs).dims.str());
if (comptime @TypeOf(rhs) == Self)
return .{ .value = self.value - rhs.value };
const TargetType = Quantity(T, dims, scales.min(@TypeOf(rhs).scales)); const TargetType = Quantity(T, dims, scales.min(@TypeOf(rhs).scales));
const lhs_converted = self.to(TargetType); const lhs_val = if (comptime @TypeOf(self) == TargetType) self.value else self.to(TargetType).value;
const rhs_converted = rhs.to(TargetType); const rhs_val = if (comptime @TypeOf(rhs) == TargetType) rhs.value else rhs.to(TargetType).value;
return .{ .value = lhs_converted.value - rhs_converted.value }; return .{ .value = lhs_val - rhs_val };
} }
pub inline fn mulBy(self: Self, rhs: anytype) Quantity( pub inline fn mulBy(self: Self, rhs: anytype) Quantity(
@ -54,19 +58,29 @@ pub fn Quantity(comptime T: type, comptime d: Dimensions, comptime s: Scales) ty
dims.add(@TypeOf(rhs).dims), dims.add(@TypeOf(rhs).dims),
scales.min(@TypeOf(rhs).scales), scales.min(@TypeOf(rhs).scales),
) { ) {
const self_ = self.to(Quantity(T, dims, scales.min(@TypeOf(rhs).scales))); const RhsType = @TypeOf(rhs);
const rhs_ = rhs.to(Quantity(T, @TypeOf(rhs).dims, scales.min(@TypeOf(rhs).scales))); const SelfNorm = Quantity(T, dims, scales.min(RhsType.scales));
return .{ .value = self_.value * rhs_.value }; const RhsNorm = Quantity(T, RhsType.dims, scales.min(RhsType.scales));
// Only convert the side(s) that actually need it
const lhs_val = if (comptime Self == SelfNorm) self.value else self.to(SelfNorm).value;
const rhs_val = if (comptime RhsType == RhsNorm) rhs.value else rhs.to(RhsNorm).value;
return .{ .value = lhs_val * rhs_val };
} }
pub inline fn divBy(self: Self, rhs: anytype) Quantity(T, dims.sub(@TypeOf(rhs).dims), scales.min(@TypeOf(rhs).scales)) { pub inline fn divBy(self: Self, rhs: anytype) Quantity(
const self_ = self.to(Quantity(T, dims, scales.min(@TypeOf(rhs).scales))); T,
const rhs_ = rhs.to(Quantity(T, @TypeOf(rhs).dims, scales.min(@TypeOf(rhs).scales))); dims.sub(@TypeOf(rhs).dims),
scales.min(@TypeOf(rhs).scales),
) {
const RhsType = @TypeOf(rhs);
const SelfNorm = Quantity(T, dims, scales.min(RhsType.scales));
const RhsNorm = Quantity(T, RhsType.dims, scales.min(RhsType.scales));
const lhs_val = if (comptime Self == SelfNorm) self.value else self.to(SelfNorm).value;
const rhs_val = if (comptime RhsType == RhsNorm) rhs.value else rhs.to(RhsNorm).value;
if (comptime @typeInfo(T) == .int) { if (comptime @typeInfo(T) == .int) {
return .{ .value = @divTrunc(self_.value, rhs_.value) }; return .{ .value = @divTrunc(lhs_val, rhs_val) };
} else { } else {
return .{ .value = self_.value / rhs_.value }; return .{ .value = lhs_val / rhs_val };
} }
} }