This commit is contained in:
Alex Dadgar
2018-10-12 15:34:21 -07:00
parent 929eb5570a
commit cb773f3dc1

View File

@@ -14,32 +14,32 @@ var (
lengthSortedUnits = make([]string, 0, numUnits)
binarySIBytes = []*Unit{
&Unit{
{
Name: "KiB",
Base: UnitByte,
Multiplier: 1 << 10,
},
&Unit{
{
Name: "MiB",
Base: UnitByte,
Multiplier: 1 << 20,
},
&Unit{
{
Name: "GiB",
Base: UnitByte,
Multiplier: 1 << 30,
},
&Unit{
{
Name: "TiB",
Base: UnitByte,
Multiplier: 1 << 40,
},
&Unit{
{
Name: "PiB",
Base: UnitByte,
Multiplier: 1 << 50,
},
&Unit{
{
Name: "EiB",
Base: UnitByte,
Multiplier: 1 << 60,
@@ -47,37 +47,37 @@ var (
}
decimalSIBytes = []*Unit{
&Unit{
{
Name: "kB",
Base: UnitByte,
Multiplier: Pow(1000, 1),
},
&Unit{
{
Name: "KB", // Alternative name for kB
Base: UnitByte,
Multiplier: Pow(1000, 1),
},
&Unit{
{
Name: "MB",
Base: UnitByte,
Multiplier: Pow(1000, 2),
},
&Unit{
{
Name: "GB",
Base: UnitByte,
Multiplier: Pow(1000, 3),
},
&Unit{
{
Name: "TB",
Base: UnitByte,
Multiplier: Pow(1000, 4),
},
&Unit{
{
Name: "PB",
Base: UnitByte,
Multiplier: Pow(1000, 5),
},
&Unit{
{
Name: "EB",
Base: UnitByte,
Multiplier: Pow(1000, 6),
@@ -85,32 +85,32 @@ var (
}
binarySIByteRates = []*Unit{
&Unit{
{
Name: "KiB/s",
Base: UnitByteRate,
Multiplier: 1 << 10,
},
&Unit{
{
Name: "MiB/s",
Base: UnitByteRate,
Multiplier: 1 << 20,
},
&Unit{
{
Name: "GiB/s",
Base: UnitByteRate,
Multiplier: 1 << 30,
},
&Unit{
{
Name: "TiB/s",
Base: UnitByteRate,
Multiplier: 1 << 40,
},
&Unit{
{
Name: "PiB/s",
Base: UnitByteRate,
Multiplier: 1 << 50,
},
&Unit{
{
Name: "EiB/s",
Base: UnitByteRate,
Multiplier: 1 << 60,
@@ -118,37 +118,37 @@ var (
}
decimalSIByteRates = []*Unit{
&Unit{
{
Name: "kB/s",
Base: UnitByteRate,
Multiplier: Pow(1000, 1),
},
&Unit{
{
Name: "KB/s", // Alternative name for kB/s
Base: UnitByteRate,
Multiplier: Pow(1000, 1),
},
&Unit{
{
Name: "MB/s",
Base: UnitByteRate,
Multiplier: Pow(1000, 2),
},
&Unit{
{
Name: "GB/s",
Base: UnitByteRate,
Multiplier: Pow(1000, 3),
},
&Unit{
{
Name: "TB/s",
Base: UnitByteRate,
Multiplier: Pow(1000, 4),
},
&Unit{
{
Name: "PB/s",
Base: UnitByteRate,
Multiplier: Pow(1000, 5),
},
&Unit{
{
Name: "EB/s",
Base: UnitByteRate,
Multiplier: Pow(1000, 6),
@@ -156,12 +156,12 @@ var (
}
hertz = []*Unit{
&Unit{
{
Name: "MHz",
Base: UnitHertz,
Multiplier: Pow(1000, 1),
},
&Unit{
{
Name: "GHz",
Base: UnitHertz,
Multiplier: Pow(1000, 3),
@@ -169,28 +169,28 @@ var (
}
watts = []*Unit{
&Unit{
{
Name: "mW",
Base: UnitWatt,
Multiplier: Pow(10, 3),
InverseMultiplier: true,
},
&Unit{
{
Name: "W",
Base: UnitWatt,
Multiplier: 1,
},
&Unit{
{
Name: "kW",
Base: UnitWatt,
Multiplier: Pow(10, 3),
},
&Unit{
{
Name: "MW",
Base: UnitWatt,
Multiplier: Pow(10, 6),
},
&Unit{
{
Name: "GW",
Base: UnitWatt,
Multiplier: Pow(10, 9),