src/Base.zig

@@ -3,39 +3,34 @@ const std = @import("std");
 // Adjust these imports to match your actual file names
 const Dimensions = @import("Dimensions.zig");
 const Scales = @import("Scales.zig");
-const Tensor = @import("Tensor.zig").Tensor;
+const Scalar = @import("Quantity.zig").Scalar;
 
 fn PhysicalConstant(comptime d: Dimensions.ArgOpts, comptime val: f64, comptime s: Scales.ArgOpts) type {
     return struct {
-        pub const dims = Dimensions.init(d);
+        const dims = Dimensions.init(d);
-        pub const scales = Scales.init(s);
+        const scales = Scales.init(s);
 
         /// Instantiates the constant into a specific numeric type.
-        pub fn Of(comptime T: type) Tensor(T, d, s, &.{1}) {
+        pub fn Of(comptime T: type) Scalar(T, d, s) {
-            const casted_val: T = switch (@typeInfo(T)) {
+            return .{ .data = @splat(@as(T, @floatCast(val))) };
-                .float => @floatCast(val),
-                .int => @intFromFloat(val),
-                else => @compileError("Unsupported type for PhysicalConstant"),
-            };
-            return Tensor(T, d, s, &.{1}).splat(casted_val);
         }
     };
 }
 
 fn BaseScalar(comptime d: Dimensions.ArgOpts) type {
     return struct {
-        pub const dims = Dimensions.init(d);
+        const dims = Dimensions.init(d);
 
         /// Creates a Scalar of this dimension using default scales.
-        /// Example: const V = Quantities.Velocity.Of(f32);
+        /// Example: const V = Quantities.Velocity.Base(f32);
         pub fn Of(comptime T: type) type {
-            return Tensor(T, d, .{}, &.{1});
+            return Scalar(T, d, .{});
         }
 
         /// Creates a Scalar of this dimension using custom scales.
-        /// Example: const Kmh = Quantities.Velocity.Scaled(f32, .{ .L = .k, .T = .hour });
+        /// Example: const Kmh = Quantities.Velocity.Scaled(f32, Scales.init(.{ .L = .k, .T = .hour }));
         pub fn Scaled(comptime T: type, comptime s: Scales.ArgOpts) type {
-            return Tensor(T, d, s, &.{1});
+            return Scalar(T, d, s);
         }
     };
 }
@@ -112,7 +107,7 @@ pub const ElectricCapacitance = BaseScalar(.{ .T = 4, .L = -2, .M = -1, .I = 2 }
 pub const ElectricImpedance = ElectricResistance;
 pub const MagneticFlux = BaseScalar(.{ .M = 1, .L = 2, .T = -2, .I = -1 });
 pub const MagneticDensity = BaseScalar(.{ .M = 1, .T = -2, .I = -1 });
-pub const MagneticStrength = BaseScalar(.{ .L = -1, .I = 1 });
+pub const MagneticStrength = BaseScalar(.{ .L = -1, .I = 1 }); // Fixed typo from MagneticStrengh
 pub const MagneticMoment = BaseScalar(.{ .L = 2, .I = 1 });
 
 // ==========================================
@@ -145,7 +140,7 @@ pub const ThermalHeat = Energy;
 pub const ThermalWork = Energy;
 pub const ThermalCapacity = BaseScalar(.{ .M = 1, .L = 2, .T = -2, .Tr = -1 });
 pub const ThermalCapacityPerMass = BaseScalar(.{ .L = 2, .T = -2, .Tr = -1 });
-pub const ThermalFluxDensity = BaseScalar(.{ .M = 1, .T = -3 });
+pub const ThermalFluxDensity = BaseScalar(.{ .M = 1, .T = -3 }); // Fixed typo from ThermalluxDensity
 pub const ThermalConductance = BaseScalar(.{ .M = 1, .L = 2, .T = -3, .Tr = -1 });
 pub const ThermalConductivity = BaseScalar(.{ .M = 1, .L = 1, .T = -3, .Tr = -1 });
 pub const ThermalResistance = BaseScalar(.{ .M = -1, .L = -2, .T = 3, .Tr = 1 });
@@ -157,24 +152,20 @@ pub const ThermalEntropy = BaseScalar(.{ .M = 1, .L = 2, .T = -2, .Tr = -1 });
 // ==========================================
 pub const Frequency = BaseScalar(.{ .T = -1 });
 pub const Viscosity = BaseScalar(.{ .M = 1, .L = -1, .T = -1 });
-pub const SurfaceTension = BaseScalar(.{ .M = 1, .T = -2 });
+pub const SurfaceTension = BaseScalar(.{ .M = 1, .T = -2 }); // Corrected from MT-2a
-
-// ==========================================
-// Tests
-// ==========================================
 
 test "BaseQuantities - Core dimensions instantiation" {
     // Basic types via generic wrappers
     const M = Meter.Of(f32);
     const distance = M.splat(100);
-    try std.testing.expectEqual(100.0, distance.data[0]);
+    try std.testing.expectEqual(100.0, distance.value());
     try std.testing.expectEqual(1, M.dims.get(.L));
     try std.testing.expectEqual(0, M.dims.get(.T));
 
     // Test specific scale variants
     const Kmh = Speed.Scaled(f32, .{ .L = .k, .T = .hour });
     const speed = Kmh.splat(120);
-    try std.testing.expectEqual(120.0, speed.data[0]);
+    try std.testing.expectEqual(120.0, speed.value());
     try std.testing.expectEqual(.k, @TypeOf(speed).scales.get(.L));
     try std.testing.expectEqual(.hour, @TypeOf(speed).scales.get(.T));
 }
@@ -185,12 +176,12 @@ test "BaseQuantities - Kinematics equations" {
 
     // Velocity = Distance / Time
     const v = d.div(t);
-    try std.testing.expectEqual(25.0, v.data[0]);
+    try std.testing.expectEqual(25.0, v.value());
     try std.testing.expect(Speed.dims.eql(@TypeOf(v).dims));
 
     // Acceleration = Velocity / Time
     const a = v.div(t);
-    try std.testing.expectEqual(12.5, a.data[0]);
+    try std.testing.expectEqual(12.5, a.value());
     try std.testing.expect(Acceleration.dims.eql(@TypeOf(a).dims));
 }
 
@@ -202,13 +193,13 @@ test "BaseQuantities - Dynamics (Force and Work)" {
 
     // Force = mass * acceleration
     const f = m.mul(a);
-    try std.testing.expectEqual(98, f.data[0]);
+    try std.testing.expectEqual(98, f.value());
     try std.testing.expect(Force.dims.eql(@TypeOf(f).dims));
 
     // Energy (Work) = Force * distance
     const distance = Meter.Of(f32).splat(5.0);
     const energy = f.mul(distance);
-    try std.testing.expectEqual(490, energy.data[0]);
+    try std.testing.expectEqual(490, energy.value());
     try std.testing.expect(Energy.dims.eql(@TypeOf(energy).dims));
 }
 
@@ -218,26 +209,26 @@ test "BaseQuantities - Electric combinations" {
 
     // Charge = Current * time
     const charge = current.mul(time);
-    try std.testing.expectEqual(6.0, charge.data[0]);
+    try std.testing.expectEqual(6.0, charge.value());
     try std.testing.expect(ElectricCharge.dims.eql(@TypeOf(charge).dims));
 }
 
 test "Constants - Initialization and dimension checks" {
     // Speed of Light
     const c = Constants.SpeedOfLight.Of(f64);
-    try std.testing.expectEqual(299792458.0, c.data[0]);
+    try std.testing.expectEqual(299792458.0, c.value());
     try std.testing.expectEqual(1, @TypeOf(c).dims.get(.L));
     try std.testing.expectEqual(-1, @TypeOf(c).dims.get(.T));
 
     // Electron Mass (verifying scale as well)
     const me = Constants.ElectronMass.Of(f64);
-    try std.testing.expectEqual(9.1093837139e-31, me.data[0]);
+    try std.testing.expectEqual(9.1093837139e-31, me.value());
     try std.testing.expectEqual(1, @TypeOf(me).dims.get(.M));
     try std.testing.expectEqual(.k, @TypeOf(me).scales.get(.M)); // Should be scaled to kg
 
     // Boltzmann Constant (Complex derived dimensions)
     const kb = Constants.Boltzmann.Of(f64);
-    try std.testing.expectEqual(1.380649e-23, kb.data[0]);
+    try std.testing.expectEqual(1.380649e-23, kb.value());
     try std.testing.expectEqual(1, @TypeOf(kb).dims.get(.M));
     try std.testing.expectEqual(2, @TypeOf(kb).dims.get(.L));
     try std.testing.expectEqual(-2, @TypeOf(kb).dims.get(.T));
@@ -246,7 +237,7 @@ test "Constants - Initialization and dimension checks" {
 
     // Vacuum Permittivity
     const eps0 = Constants.VacuumPermittivity.Of(f64);
-    try std.testing.expectEqual(8.8541878188e-12, eps0.data[0]);
+    try std.testing.expectEqual(8.8541878188e-12, eps0.value());
     try std.testing.expectEqual(-1, @TypeOf(eps0).dims.get(.M));
     try std.testing.expectEqual(-3, @TypeOf(eps0).dims.get(.L));
     try std.testing.expectEqual(4, @TypeOf(eps0).dims.get(.T));
@@ -254,7 +245,7 @@ test "Constants - Initialization and dimension checks" {
 
     // Fine Structure Constant (Dimensionless)
     const alpha = Constants.FineStructure.Of(f64);
-    try std.testing.expectEqual(0.0072973525643, alpha.data[0]);
+    try std.testing.expectEqual(0.0072973525643, alpha.value());
     try std.testing.expectEqual(0, @TypeOf(alpha).dims.get(.M));
     try std.testing.expectEqual(0, @TypeOf(alpha).dims.get(.L));
 }

src/Dimensions.zig

@@ -51,17 +51,17 @@ data: std.EnumArray(Dimension, comptime_int),
 /// Unspecified dimensions default to 0.
 pub fn init(comptime init_val: ArgOpts) Self {
     var s = Self{ .data = std.EnumArray(Dimension, comptime_int).initFill(0) };
-    for (std.meta.fields(@TypeOf(init_val))) |f|
+    inline for (std.meta.fields(@TypeOf(init_val))) |f|
         s.data.set(@field(Dimension, f.name), @field(init_val, f.name));
     return s;
 }
 
 pub fn initFill(comptime val: comptime_int) Self {
-    comptime return .{ .data = std.EnumArray(Dimension, comptime_int).initFill(val) };
+    return .{ .data = std.EnumArray(Dimension, comptime_int).initFill(val) };
 }
 
 pub fn get(comptime self: Self, comptime key: Dimension) comptime_int {
-    comptime return self.data.get(key);
+    return self.data.get(key);
 }
 
 pub fn set(comptime self: *Self, comptime key: Dimension, comptime val: i8) void {
@@ -70,40 +70,40 @@ pub fn set(comptime self: *Self, comptime key: Dimension, comptime val: i8) void
 
 pub fn argsOpt(self: Self) ArgOpts {
     var args: ArgOpts = undefined;
-    for (std.enums.values(Dimension)) |d|
+    inline for (std.enums.values(Dimension)) |d|
         @field(args, @tagName(d)) = self.get(d);
-    comptime return args;
+    return args;
 }
 
 /// Add exponents component-wise. Used internally by `mul`.
 pub fn add(comptime a: Self, comptime b: Self) Self {
     var result = Self.initFill(0);
-    for (std.enums.values(Dimension)) |d|
+    inline for (std.enums.values(Dimension)) |d|
         result.set(d, a.get(d) + b.get(d));
-    comptime return result;
+    return result;
 }
 
 /// Subtract exponents component-wise. Used internally by `div`.
 pub fn sub(comptime a: Self, comptime b: Self) Self {
     var result = Self.initFill(0);
-    for (std.enums.values(Dimension)) |d|
+    inline for (std.enums.values(Dimension)) |d|
         result.set(d, a.get(d) - b.get(d));
-    comptime return result;
+    return result;
 }
 
 /// Multiply exponents by a scalar integer. Used internally by `pow` in Scalar.
 pub fn scale(comptime a: Self, comptime exp: comptime_int) Self {
     var result = Self.initFill(0);
-    for (std.enums.values(Dimension)) |d|
+    inline for (std.enums.values(Dimension)) |d|
         result.set(d, a.get(d) * exp);
-    comptime return result;
+    return result;
 }
 
 pub fn div(comptime a: Self, comptime exp: comptime_int) Self {
     var result = Self.initFill(0);
     inline for (std.enums.values(Dimension)) |d|
         result.set(d, a.get(d) / exp);
-    comptime return result;
+    return result;
 }
 
 /// Returns true if every dimension exponent is equal. Used to enforce type compatibility in `add`, `sub`, `to`.

src/Scales.zig

@@ -1,4 +1,5 @@
 const std = @import("std");
+const hlp = @import("helper.zig");
 const Dimensions = @import("Dimensions.zig");
 const Dimension = @import("Dimensions.zig").Dimension;
 
@@ -65,7 +66,7 @@ pub const UnitScale = enum(isize) {
     }
 
     pub inline fn getFactor(self: @This()) comptime_float {
-        comptime return switch (self) {
+        return comptime switch (self) {
             // Standard SI Exponents
             inline .P, .T, .G, .M, .k, .h, .da, .none, .d, .c, .m, .u, .n, .p, .f => std.math.pow(f64, 10.0, @floatFromInt(@intFromEnum(self))),
 
@@ -83,7 +84,7 @@ pub const UnitScale = enum(isize) {
             inline .lb => 453.59237,
             inline .st => 6350.29318,
 
-            else => @floatFromInt(@intFromEnum(self)),
+            inline else => @floatFromInt(@intFromEnum(self)),
         };
     }
 };
@@ -98,16 +99,16 @@ data: std.EnumArray(Dimension, UnitScale),
 pub fn init(comptime init_val: ArgOpts) Self {
     comptime var s = Self{ .data = std.EnumArray(Dimension, UnitScale).initFill(.none) };
     inline for (std.meta.fields(@TypeOf(init_val))) |f| {
-        if (comptime @typeInfo(@TypeOf(@field(init_val, f.name))) == .comptime_int)
+        if (comptime hlp.isInt(@TypeOf(@field(init_val, f.name))))
             s.data.set(@field(Dimension, f.name), @enumFromInt(@field(init_val, f.name)))
         else
             s.data.set(@field(Dimension, f.name), @field(init_val, f.name));
     }
-    return comptime s;
+    return s;
 }
 
 pub fn initFill(comptime val: UnitScale) Self {
-    comptime return .{ .data = std.EnumArray(Dimension, UnitScale).initFill(val) };
+    return comptime .{ .data = std.EnumArray(Dimension, UnitScale).initFill(val) };
 }
 
 pub fn get(comptime self: Self, comptime key: Dimension) UnitScale {
@@ -115,7 +116,7 @@ pub fn get(comptime self: Self, comptime key: Dimension) UnitScale {
 }
 
 pub fn set(comptime self: *Self, comptime key: Dimension, comptime val: UnitScale) void {
-    self.data.set(key, val);
+    comptime self.data.set(key, val);
 }
 
 pub fn argsOpt(self: Self) ArgOpts {
@@ -144,5 +145,5 @@ pub inline fn getFactor(comptime s: Self, comptime d: Dimensions) comptime_float
                 factor /= base;
         }
     }
-    comptime return factor;
+    return comptime factor;
 }

src/benchmark.zig

@@ -1,6 +1,7 @@
 const std = @import("std");
 const Io = std.Io;
-const Tensor = @import("Tensor.zig").Tensor;
+const Scalar = @import("Quantity.zig").Scalar;
+const Vector = @import("Quantity.zig").Vector;
 
 var io: Io = undefined;
 pub fn main(init: std.process.Init) !void {
@@ -10,16 +11,16 @@ pub fn main(init: std.process.Init) !void {
 
     io = init.io;
 
-    try vectorSIMDvsNative(f64, &stdout_writer.interface);
+    // try vectorSIMDvsNative(f64, &stdout_writer.interface);
-    try stdout_writer.flush();
+    // try stdout_writer.flush();
-    try vectorSIMDvsNative(f32, &stdout_writer.interface);
+    // try vectorSIMDvsNative(f32, &stdout_writer.interface);
-    try stdout_writer.flush();
+    // try stdout_writer.flush();
-    try vectorSIMDvsNative(i32, &stdout_writer.interface);
+    // try vectorSIMDvsNative(i32, &stdout_writer.interface);
-    try stdout_writer.flush();
+    // try stdout_writer.flush();
-    try vectorSIMDvsNative(i64, &stdout_writer.interface);
+    // try vectorSIMDvsNative(i64, &stdout_writer.interface);
-    try stdout_writer.flush();
+    // try stdout_writer.flush();
-    try vectorSIMDvsNative(i128, &stdout_writer.interface);
+    // try vectorSIMDvsNative(i128, &stdout_writer.interface);
-    try stdout_writer.flush();
+    // try stdout_writer.flush();
 
     try bench_Scalar(&stdout_writer.interface);
     try stdout_writer.flush();
@@ -96,9 +97,9 @@ fn bench_Scalar(writer: *std.Io.Writer) !void {
 
     comptime var tidx: usize = 0;
     inline for (Types, TNames) |T, tname| {
-        const M = Tensor(T, .{ .L = 1 }, .{}, &.{1});
+        const M = Scalar(T, .{ .L = 1 }, .{});
-        const KM = Tensor(T, .{ .L = 1 }, .{ .L = .k }, &.{1});
+        const KM = Scalar(T, .{ .L = 1 }, .{ .L = .k });
-        const S = Tensor(T, .{ .T = 1 }, .{}, &.{1});
+        const S = Scalar(T, .{ .T = 1 }, .{});
 
         inline for (Ops, 0..) |op_name, oidx| {
             var samples: [SAMPLES]f64 = undefined;
@@ -198,8 +199,8 @@ fn bench_vsNative(writer: *std.Io.Writer) !void {
             var native_total_ns: f64 = 0;
             var quantity_total_ns: f64 = 0;
 
-            const M = Tensor(T, .{ .L = 1 }, .{}, &.{1});
+            const M = Scalar(T, .{ .L = 1 }, .{});
-            const S = Tensor(T, .{ .T = 1 }, .{}, &.{1});
+            const S = Scalar(T, .{ .T = 1 }, .{});
 
             std.mem.doNotOptimizeAway({
                 for (0..SAMPLES) |_| {
@@ -320,9 +321,9 @@ fn bench_crossTypeVsNative(writer: *std.Io.Writer) !void {
                 var native_total_ns: f64 = 0;
                 var quantity_total_ns: f64 = 0;
 
-                const M1 = Tensor(T1, .{ .L = 1 }, .{}, &.{1});
+                const M1 = Scalar(T1, .{ .L = 1 }, .{});
-                const M2 = Tensor(T2, .{ .L = 1 }, .{}, &.{1});
+                const M2 = Scalar(T2, .{ .L = 1 }, .{});
-                const S2 = Tensor(T2, .{ .T = 1 }, .{}, &.{1});
+                const S2 = Scalar(T2, .{ .T = 1 }, .{});
 
                 std.mem.doNotOptimizeAway({
                     for (0..SAMPLES) |_| {
@@ -428,8 +429,9 @@ fn bench_Vector(writer: *std.Io.Writer) !void {
             try writer.print("│ {s:<16} │ {s:<4} │", .{ op_name, tname });
 
             inline for (Lengths) |len| {
-                const Q_time = Tensor(T, .{ .T = 1 }, .{}, &.{1});
+                const Q_base = Scalar(T, .{ .L = 1 }, .{});
-                const V = Tensor(T, .{ .L = 1 }, .{}, &.{len});
+                const Q_time = Scalar(T, .{ .T = 1 }, .{});
+                const V = Vector(len, Q_base);
 
                 // cross product is only defined for len == 3
                 const is_cross = comptime std.mem.eql(u8, op_name, "cross");
@@ -453,10 +455,10 @@ fn bench_Vector(writer: *std.Io.Writer) !void {
                                 _ = v1.div(V.splat(getVal(T, i +% 2, 63)));
                             } else if (comptime std.mem.eql(u8, op_name, "mulScalar")) {
                                 const s_val = Q_time.splat(getVal(T, i +% 2, 63));
-                                _ = v1.mul(s_val);
+                                _ = v1.mulScalar(s_val);
                             } else if (comptime std.mem.eql(u8, op_name, "dot")) {
                                 const v2 = V.splat(getVal(T, i +% 5, 63));
-                                _ = v1.contract(v2, 0, 0);
+                                _ = v1.dot(v2);
                             } else if (comptime std.mem.eql(u8, op_name, "cross")) {
                                 // len == 3 guaranteed by the guard above
                                 const v2 = V.splat(getVal(T, i +% 5, 63));

src/helper.zig

@@ -0,0 +1,97 @@
+const std = @import("std");
+
+pub fn isInt(comptime T: type) bool {
+    return @typeInfo(T) == .int or @typeInfo(T) == .comptime_int;
+}
+
+pub fn printSuperscript(writer: *std.Io.Writer, n: i32) !void {
+    if (n == 0) return;
+    var val = n;
+    if (val < 0) {
+        try writer.writeAll("\u{207B}");
+        val = -val;
+    }
+    var buf: [12]u8 = undefined;
+    const str = std.fmt.bufPrint(&buf, "{d}", .{val}) catch return;
+    for (str) |c| {
+        const s = switch (c) {
+            '0' => "\u{2070}",
+            '1' => "\u{00B9}",
+            '2' => "\u{00B2}",
+            '3' => "\u{00B3}",
+            '4' => "\u{2074}",
+            '5' => "\u{2075}",
+            '6' => "\u{2076}",
+            '7' => "\u{2077}",
+            '8' => "\u{2078}",
+            '9' => "\u{2079}",
+            else => unreachable,
+        };
+        try writer.writeAll(s);
+    }
+}
+
+const Scales = @import("Scales.zig");
+const Dimensions = @import("Dimensions.zig");
+const Dimension = @import("Dimensions.zig").Dimension;
+
+pub fn finerScales(comptime T1: type, comptime T2: type) Scales {
+    const d1: Dimensions = T1.dims;
+    const d2: Dimensions = T2.dims;
+    const s1: Scales = T1.scales;
+    const s2: Scales = T2.scales;
+    comptime var out = Scales.initFill(.none);
+    inline for (std.enums.values(Dimension)) |dim| {
+        const scale1 = comptime s1.get(dim);
+        const scale2 = comptime s2.get(dim);
+        out.set(dim, if (comptime d1.get(dim) == 0 and d2.get(dim) == 0)
+            .none
+        else if (comptime d1.get(dim) == 0)
+            scale2
+        else if (comptime d2.get(dim) == 0)
+            scale1
+        else if (comptime scale1.getFactor() > scale2.getFactor())
+            scale2
+        else
+            scale1);
+    }
+    comptime return out;
+}
+
+// ---------------------------------------------------------------------------
+// RHS normalisation helpers
+// ---------------------------------------------------------------------------
+
+const Quantity = @import("Quantity.zig").Quantity;
+
+/// Returns true if `T` is a `Scalar_` type (has `dims`, `scales`, and `value`).
+pub fn isScalarType(comptime T: type) bool {
+    return @typeInfo(T) == .@"struct" and
+        @hasDecl(T, "ISQUANTITY") and
+        @field(T, "ISQUANTITY");
+}
+
+/// Resolve the Scalar type that `rhs` will be treated as.
+///
+/// Accepted rhs types:
+///   - Any `Scalar_` type               → returned as-is
+///   - `comptime_int` / `comptime_float` → dimensionless `Scalar_(BaseT, {}, {})`
+///   - `BaseT` (the scalar's value type) → dimensionless `Scalar_(BaseT, {}, {})`
+///
+/// Everything else is a compile error, including other int/float types.
+pub fn rhsQuantityType(comptime ValueType: type, N: usize, comptime RhsT: type) type {
+    if (comptime isScalarType(RhsT)) return RhsT;
+    if (comptime RhsT == comptime_int or RhsT == comptime_float or RhsT == ValueType)
+        return Quantity(ValueType, N, .{}, .{});
+    @compileError(
+        "rhs must be a Scalar, " ++ @typeName(ValueType) ++
+            ", comptime_int, or comptime_float; got " ++ @typeName(RhsT),
+    );
+}
+
+/// Convert `rhs` to its normalised Scalar form (see `rhsScalarType`).
+pub inline fn toRhsQuantity(comptime BaseT: type, N: usize, rhs: anytype) rhsQuantityType(BaseT, N, @TypeOf(rhs)) {
+    if (comptime isScalarType(@TypeOf(rhs))) return rhs;
+    const DimLess = Quantity(BaseT, N, .{}, .{});
+    return DimLess{ .data = @splat(@as(BaseT, rhs)) };
+}

src/main.zig

@@ -1,13 +1,15 @@
 const std = @import("std");
 
-pub const Tensor = @import("Tensor.zig").Tensor;
+pub const Vector = @import("Quantity.zig").Vector;
+pub const Scalar = @import("Quantity.zig").Scalar;
 pub const Dimensions = @import("Dimensions.zig");
 pub const Scales = @import("Scales.zig");
 pub const Base = @import("Base.zig");
 
 test {
-    _ = @import("Tensor.zig");
+    _ = @import("Quantity.zig");
     _ = @import("Dimensions.zig");
     _ = @import("Scales.zig");
     _ = @import("Base.zig");
+    _ = @import("helper.zig");
 }