Skip to content

Commit 43435df

Browse files
baxcodersbaxcoders
committed
Added few prefixes
- ApparentPower - Added prefix to base unit: "Giga" - Density - Added prefix to base unit: "Milli" - Power - Added prefixes to base unit: "Deci", "Deca" - ReactivePower - Added prefix to base unit: "Giga"
1 parent 105d4d9 commit 43435df

25 files changed

+503
-38
lines changed

‎UnitsNet.Tests/CustomCode/ApparentPowerTests.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,12 @@ namespace UnitsNet.Tests.CustomCode
4646
{
4747
public class ApparentPowerTests : ApparentPowerTestsBase
4848
{
49-
protected override double KilovoltamperesInOneVoltampere => 1e-3;
49+
protected override double VoltamperesInOneVoltampere => 1;
5050

51-
protected override double MegavoltamperesInOneVoltampere => 1e-6;
51+
protected override double KilovoltamperesInOneVoltampere => 1E-3;
5252

53-
protected override double VoltamperesInOneVoltampere => 1;
53+
protected override double MegavoltamperesInOneVoltampere => 1E-6;
54+
55+
protected override double GigavoltamperesInOneVoltampere => 1E-9;
5456
}
5557
}

‎UnitsNet.Tests/CustomCode/DensityTests.cs‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,14 @@ namespace UnitsNet.Tests.CustomCode
2727
{
2828
public class DensityTests : DensityTestsBase
2929
{
30+
protected override double MilligramsPerCubicMeterInOneKilogramPerCubicMeter => 1e6;
31+
3032
protected override double GramsPerCubicCentimeterInOneKilogramPerCubicMeter => 1e-3;
33+
3134
protected override double GramsPerCubicMeterInOneKilogramPerCubicMeter => 1e3;
35+
3236
protected override double GramsPerCubicMillimeterInOneKilogramPerCubicMeter => 1e-6;
37+
3338
protected override double KilogramsPerCubicCentimeterInOneKilogramPerCubicMeter => 1e-6;
3439

3540
protected override double KilogramsPerCubicMeterInOneKilogramPerCubicMeter => 1;
@@ -70,9 +75,9 @@ public class DensityTests : DensityTestsBase
7075

7176
protected override double GramsPerMilliliterInOneKilogramPerCubicMeter => 1e-3;
7277

73-
protected override double MicrogramsPerDeciLiterInOneKilogramPerCubicMeter => 1e5;
78+
protected override double MicrogramsPerDeciLiterInOneKilogramPerCubicMeter => 1e5;
7479

75-
protected override double MicrogramsPerLiterInOneKilogramPerCubicMeter => 1e6;
80+
protected override double MicrogramsPerLiterInOneKilogramPerCubicMeter => 1e6;
7681

7782
protected override double MicrogramsPerMilliliterInOneKilogramPerCubicMeter => 1e3;
7883

@@ -94,6 +99,7 @@ public class DensityTests : DensityTestsBase
9499

95100
protected override double PicogramsPerMilliliterInOneKilogramPerCubicMeter => 1e9;
96101

102+
97103
[Fact]
98104
public static void DensityTimesVolumeEqualsMass()
99105
{
@@ -132,12 +138,5 @@ public void ExpectDensityConvertedToMolarityCorrectly()
132138
var molarity = density.ToMolarity(mw).MolesPerCubicMeter;
133139
AssertEx.EqualTolerance(1026.98355, molarity, KilogramsPerCubicMeterTolerance);
134140
}
135-
136-
[Fact]
137-
public void DensityTimesSpeedEqualsMassFlux()
138-
{
139-
MassFlux massFlux = Density.FromKilogramsPerCubicMeter(20) * Speed.FromMetersPerSecond(2);
140-
Assert.Equal(massFlux, MassFlux.FromKilogramsPerSecondPerSquareMeter(40));
141-
}
142141
}
143-
}
142+
}

‎UnitsNet.Tests/CustomCode/PowerTests.cs‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@ public class PowerTests : PowerTestsBase
3636

3737
protected override double MilliwattsInOneWatt => 1e3;
3838

39+
protected override double DeciwattsInOneWatt => 1e1;
40+
3941
protected override double WattsInOneWatt => 1;
4042

41-
protected override double KilobritishThermalUnitsPerHourInOneWatt => 3.412141633e-3;
43+
protected override double DecawattsInOneWatt => 1e-1;
4244

4345
protected override double KilowattsInOneWatt => 1e-3;
4446

@@ -50,7 +52,10 @@ public class PowerTests : PowerTestsBase
5052

5153
protected override double PetawattsInOneWatt => 1e-15;
5254

55+
protected override double KilobritishThermalUnitsPerHourInOneWatt => 3.412141633e-3;
56+
5357
protected override double BoilerHorsepowerInOneWatt => 1.0191082802547770700636942675159e-4;
58+
5459
protected override double BritishThermalUnitsPerHourInOneWatt => 3.412141633;
5560

5661
protected override double ElectricalHorsepowerInOneWatt => 0.00134048257372654155495978552279;
@@ -64,49 +69,49 @@ public class PowerTests : PowerTestsBase
6469
[Fact]
6570
public void DurationTimesPowerEqualsEnergy()
6671
{
67-
Energy energy = Duration.FromSeconds(8.0)*Power.FromWatts(5.0);
72+
Energy energy = Duration.FromSeconds(8.0) * Power.FromWatts(5.0);
6873
Assert.Equal(energy, Energy.FromJoules(40.0));
6974
}
7075

7176
[Fact]
7277
public void PowerDividedByRotationalSpeedEqualsForce()
7378
{
74-
Torque torque = Power.FromWatts(15.0)/RotationalSpeed.FromRadiansPerSecond(3);
79+
Torque torque = Power.FromWatts(15.0) / RotationalSpeed.FromRadiansPerSecond(3);
7580
Assert.Equal(torque, Torque.FromNewtonMeters(5));
7681
}
7782

7883
[Fact]
7984
public void PowerDividedBySpeedEqualsForce()
8085
{
81-
Force force = Power.FromWatts(15.0)/Speed.FromMetersPerSecond(3);
86+
Force force = Power.FromWatts(15.0) / Speed.FromMetersPerSecond(3);
8287
Assert.Equal(force, Force.FromNewtons(5));
8388
}
8489

8590
[Fact]
8691
public void PowerDividedByTorqueEqualsRotationalSpeed()
8792
{
88-
RotationalSpeed rotationalSpeed = Power.FromWatts(15.0)/Torque.FromNewtonMeters(3);
93+
RotationalSpeed rotationalSpeed = Power.FromWatts(15.0) / Torque.FromNewtonMeters(3);
8994
Assert.Equal(rotationalSpeed, RotationalSpeed.FromRadiansPerSecond(5));
9095
}
9196

9297
[Fact]
9398
public void PowerTimesDurationEqualsEnergy()
9499
{
95-
Energy energy = Power.FromWatts(5.0)*Duration.FromSeconds(8.0);
100+
Energy energy = Power.FromWatts(5.0) * Duration.FromSeconds(8.0);
96101
Assert.Equal(energy, Energy.FromJoules(40.0));
97102
}
98103

99104
[Fact]
100105
public void PowerTimesTimeSpanEqualsEnergy()
101106
{
102-
Energy energy = Power.FromWatts(5.0)*TimeSpan.FromSeconds(8.0);
107+
Energy energy = Power.FromWatts(5.0) * TimeSpan.FromSeconds(8.0);
103108
Assert.Equal(energy, Energy.FromJoules(40.0));
104109
}
105110

106111
[Fact]
107112
public void TimeSpanTimesPowerEqualsEnergy()
108113
{
109-
Energy energy = TimeSpan.FromSeconds(8.0)*Power.FromWatts(5.0);
114+
Energy energy = TimeSpan.FromSeconds(8.0) * Power.FromWatts(5.0);
110115
Assert.Equal(energy, Energy.FromJoules(40.0));
111116
}
112117

@@ -131,4 +136,4 @@ public void PowerDividedBySpecificEnergyEqualsMassFlow()
131136
Assert.Equal(massFlow, MassFlow.FromKilogramsPerSecond(5));
132137
}
133138
}
134-
}
139+
}

‎UnitsNet.Tests/CustomCode/ReactivePowerTests.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,12 @@ namespace UnitsNet.Tests.CustomCode
4646
{
4747
public class ReactivePowerTests : ReactivePowerTestsBase
4848
{
49-
protected override double KilovoltamperesReactiveInOneVoltampereReactive => 1e-3;
49+
protected override double VoltamperesReactiveInOneVoltampereReactive => 1;
5050

51-
protected override double MegavoltamperesReactiveInOneVoltampereReactive => 1e-6;
51+
protected override double KilovoltamperesReactiveInOneVoltampereReactive => 1E-3;
5252

53-
protected override double VoltamperesReactiveInOneVoltampereReactive => 1;
53+
protected override double MegavoltamperesReactiveInOneVoltampereReactive => 1E-6;
54+
55+
protected override double GigavoltamperesReactiveInOneVoltampereReactive => 1E-9;
5456
}
5557
}

‎UnitsNet.Tests/GeneratedCode/ApparentPowerTestsBase.g.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,13 @@ namespace UnitsNet.Tests
5252
// ReSharper disable once PartialTypeWithSinglePart
5353
public abstract partial class ApparentPowerTestsBase
5454
{
55+
protected abstract double GigavoltamperesInOneVoltampere { get; }
5556
protected abstract double KilovoltamperesInOneVoltampere { get; }
5657
protected abstract double MegavoltamperesInOneVoltampere { get; }
5758
protected abstract double VoltamperesInOneVoltampere { get; }
5859

5960
// ReSharper disable VirtualMemberNeverOverriden.Global
61+
protected virtual double GigavoltamperesTolerance { get { return 1e-5; } }
6062
protected virtual double KilovoltamperesTolerance { get { return 1e-5; } }
6163
protected virtual double MegavoltamperesTolerance { get { return 1e-5; } }
6264
protected virtual double VoltamperesTolerance { get { return 1e-5; } }
@@ -66,6 +68,7 @@ public abstract partial class ApparentPowerTestsBase
6668
public void VoltampereToApparentPowerUnits()
6769
{
6870
ApparentPower voltampere = ApparentPower.FromVoltamperes(1);
71+
AssertEx.EqualTolerance(GigavoltamperesInOneVoltampere, voltampere.Gigavoltamperes, GigavoltamperesTolerance);
6972
AssertEx.EqualTolerance(KilovoltamperesInOneVoltampere, voltampere.Kilovoltamperes, KilovoltamperesTolerance);
7073
AssertEx.EqualTolerance(MegavoltamperesInOneVoltampere, voltampere.Megavoltamperes, MegavoltamperesTolerance);
7174
AssertEx.EqualTolerance(VoltamperesInOneVoltampere, voltampere.Voltamperes, VoltamperesTolerance);
@@ -74,6 +77,7 @@ public void VoltampereToApparentPowerUnits()
7477
[Fact]
7578
public void FromValueAndUnit()
7679
{
80+
AssertEx.EqualTolerance(1, ApparentPower.From(1, ApparentPowerUnit.Gigavoltampere).Gigavoltamperes, GigavoltamperesTolerance);
7781
AssertEx.EqualTolerance(1, ApparentPower.From(1, ApparentPowerUnit.Kilovoltampere).Kilovoltamperes, KilovoltamperesTolerance);
7882
AssertEx.EqualTolerance(1, ApparentPower.From(1, ApparentPowerUnit.Megavoltampere).Megavoltamperes, MegavoltamperesTolerance);
7983
AssertEx.EqualTolerance(1, ApparentPower.From(1, ApparentPowerUnit.Voltampere).Voltamperes, VoltamperesTolerance);
@@ -83,6 +87,7 @@ public void FromValueAndUnit()
8387
public void As()
8488
{
8589
var voltampere = ApparentPower.FromVoltamperes(1);
90+
AssertEx.EqualTolerance(GigavoltamperesInOneVoltampere, voltampere.As(ApparentPowerUnit.Gigavoltampere), GigavoltamperesTolerance);
8691
AssertEx.EqualTolerance(KilovoltamperesInOneVoltampere, voltampere.As(ApparentPowerUnit.Kilovoltampere), KilovoltamperesTolerance);
8792
AssertEx.EqualTolerance(MegavoltamperesInOneVoltampere, voltampere.As(ApparentPowerUnit.Megavoltampere), MegavoltamperesTolerance);
8893
AssertEx.EqualTolerance(VoltamperesInOneVoltampere, voltampere.As(ApparentPowerUnit.Voltampere), VoltamperesTolerance);
@@ -92,6 +97,7 @@ public void As()
9297
public void ConversionRoundTrip()
9398
{
9499
ApparentPower voltampere = ApparentPower.FromVoltamperes(1);
100+
AssertEx.EqualTolerance(1, ApparentPower.FromGigavoltamperes(voltampere.Gigavoltamperes).Voltamperes, GigavoltamperesTolerance);
95101
AssertEx.EqualTolerance(1, ApparentPower.FromKilovoltamperes(voltampere.Kilovoltamperes).Voltamperes, KilovoltamperesTolerance);
96102
AssertEx.EqualTolerance(1, ApparentPower.FromMegavoltamperes(voltampere.Megavoltamperes).Voltamperes, MegavoltamperesTolerance);
97103
AssertEx.EqualTolerance(1, ApparentPower.FromVoltamperes(voltampere.Voltamperes).Voltamperes, VoltamperesTolerance);

‎UnitsNet.Tests/GeneratedCode/DensityTestsBase.g.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public abstract partial class DensityTestsBase
7272
protected abstract double MicrogramsPerDeciLiterInOneKilogramPerCubicMeter { get; }
7373
protected abstract double MicrogramsPerLiterInOneKilogramPerCubicMeter { get; }
7474
protected abstract double MicrogramsPerMilliliterInOneKilogramPerCubicMeter { get; }
75+
protected abstract double MilligramsPerCubicMeterInOneKilogramPerCubicMeter { get; }
7576
protected abstract double MilligramsPerDeciLiterInOneKilogramPerCubicMeter { get; }
7677
protected abstract double MilligramsPerLiterInOneKilogramPerCubicMeter { get; }
7778
protected abstract double MilligramsPerMilliliterInOneKilogramPerCubicMeter { get; }
@@ -109,6 +110,7 @@ public abstract partial class DensityTestsBase
109110
protected virtual double MicrogramsPerDeciLiterTolerance { get { return 1e-5; } }
110111
protected virtual double MicrogramsPerLiterTolerance { get { return 1e-5; } }
111112
protected virtual double MicrogramsPerMilliliterTolerance { get { return 1e-5; } }
113+
protected virtual double MilligramsPerCubicMeterTolerance { get { return 1e-5; } }
112114
protected virtual double MilligramsPerDeciLiterTolerance { get { return 1e-5; } }
113115
protected virtual double MilligramsPerLiterTolerance { get { return 1e-5; } }
114116
protected virtual double MilligramsPerMilliliterTolerance { get { return 1e-5; } }
@@ -150,6 +152,7 @@ public void KilogramPerCubicMeterToDensityUnits()
150152
AssertEx.EqualTolerance(MicrogramsPerDeciLiterInOneKilogramPerCubicMeter, kilogrampercubicmeter.MicrogramsPerDeciLiter, MicrogramsPerDeciLiterTolerance);
151153
AssertEx.EqualTolerance(MicrogramsPerLiterInOneKilogramPerCubicMeter, kilogrampercubicmeter.MicrogramsPerLiter, MicrogramsPerLiterTolerance);
152154
AssertEx.EqualTolerance(MicrogramsPerMilliliterInOneKilogramPerCubicMeter, kilogrampercubicmeter.MicrogramsPerMilliliter, MicrogramsPerMilliliterTolerance);
155+
AssertEx.EqualTolerance(MilligramsPerCubicMeterInOneKilogramPerCubicMeter, kilogrampercubicmeter.MilligramsPerCubicMeter, MilligramsPerCubicMeterTolerance);
153156
AssertEx.EqualTolerance(MilligramsPerDeciLiterInOneKilogramPerCubicMeter, kilogrampercubicmeter.MilligramsPerDeciLiter, MilligramsPerDeciLiterTolerance);
154157
AssertEx.EqualTolerance(MilligramsPerLiterInOneKilogramPerCubicMeter, kilogrampercubicmeter.MilligramsPerLiter, MilligramsPerLiterTolerance);
155158
AssertEx.EqualTolerance(MilligramsPerMilliliterInOneKilogramPerCubicMeter, kilogrampercubicmeter.MilligramsPerMilliliter, MilligramsPerMilliliterTolerance);
@@ -190,6 +193,7 @@ public void FromValueAndUnit()
190193
AssertEx.EqualTolerance(1, Density.From(1, DensityUnit.MicrogramPerDeciliter).MicrogramsPerDeciLiter, MicrogramsPerDeciLiterTolerance);
191194
AssertEx.EqualTolerance(1, Density.From(1, DensityUnit.MicrogramPerLiter).MicrogramsPerLiter, MicrogramsPerLiterTolerance);
192195
AssertEx.EqualTolerance(1, Density.From(1, DensityUnit.MicrogramPerMilliliter).MicrogramsPerMilliliter, MicrogramsPerMilliliterTolerance);
196+
AssertEx.EqualTolerance(1, Density.From(1, DensityUnit.MilligramPerCubicMeter).MilligramsPerCubicMeter, MilligramsPerCubicMeterTolerance);
193197
AssertEx.EqualTolerance(1, Density.From(1, DensityUnit.MilligramPerDeciliter).MilligramsPerDeciLiter, MilligramsPerDeciLiterTolerance);
194198
AssertEx.EqualTolerance(1, Density.From(1, DensityUnit.MilligramPerLiter).MilligramsPerLiter, MilligramsPerLiterTolerance);
195199
AssertEx.EqualTolerance(1, Density.From(1, DensityUnit.MilligramPerMilliliter).MilligramsPerMilliliter, MilligramsPerMilliliterTolerance);
@@ -231,6 +235,7 @@ public void As()
231235
AssertEx.EqualTolerance(MicrogramsPerDeciLiterInOneKilogramPerCubicMeter, kilogrampercubicmeter.As(DensityUnit.MicrogramPerDeciliter), MicrogramsPerDeciLiterTolerance);
232236
AssertEx.EqualTolerance(MicrogramsPerLiterInOneKilogramPerCubicMeter, kilogrampercubicmeter.As(DensityUnit.MicrogramPerLiter), MicrogramsPerLiterTolerance);
233237
AssertEx.EqualTolerance(MicrogramsPerMilliliterInOneKilogramPerCubicMeter, kilogrampercubicmeter.As(DensityUnit.MicrogramPerMilliliter), MicrogramsPerMilliliterTolerance);
238+
AssertEx.EqualTolerance(MilligramsPerCubicMeterInOneKilogramPerCubicMeter, kilogrampercubicmeter.As(DensityUnit.MilligramPerCubicMeter), MilligramsPerCubicMeterTolerance);
234239
AssertEx.EqualTolerance(MilligramsPerDeciLiterInOneKilogramPerCubicMeter, kilogrampercubicmeter.As(DensityUnit.MilligramPerDeciliter), MilligramsPerDeciLiterTolerance);
235240
AssertEx.EqualTolerance(MilligramsPerLiterInOneKilogramPerCubicMeter, kilogrampercubicmeter.As(DensityUnit.MilligramPerLiter), MilligramsPerLiterTolerance);
236241
AssertEx.EqualTolerance(MilligramsPerMilliliterInOneKilogramPerCubicMeter, kilogrampercubicmeter.As(DensityUnit.MilligramPerMilliliter), MilligramsPerMilliliterTolerance);
@@ -272,6 +277,7 @@ public void ConversionRoundTrip()
272277
AssertEx.EqualTolerance(1, Density.FromMicrogramsPerDeciLiter(kilogrampercubicmeter.MicrogramsPerDeciLiter).KilogramsPerCubicMeter, MicrogramsPerDeciLiterTolerance);
273278
AssertEx.EqualTolerance(1, Density.FromMicrogramsPerLiter(kilogrampercubicmeter.MicrogramsPerLiter).KilogramsPerCubicMeter, MicrogramsPerLiterTolerance);
274279
AssertEx.EqualTolerance(1, Density.FromMicrogramsPerMilliliter(kilogrampercubicmeter.MicrogramsPerMilliliter).KilogramsPerCubicMeter, MicrogramsPerMilliliterTolerance);
280+
AssertEx.EqualTolerance(1, Density.FromMilligramsPerCubicMeter(kilogrampercubicmeter.MilligramsPerCubicMeter).KilogramsPerCubicMeter, MilligramsPerCubicMeterTolerance);
275281
AssertEx.EqualTolerance(1, Density.FromMilligramsPerDeciLiter(kilogrampercubicmeter.MilligramsPerDeciLiter).KilogramsPerCubicMeter, MilligramsPerDeciLiterTolerance);
276282
AssertEx.EqualTolerance(1, Density.FromMilligramsPerLiter(kilogrampercubicmeter.MilligramsPerLiter).KilogramsPerCubicMeter, MilligramsPerLiterTolerance);
277283
AssertEx.EqualTolerance(1, Density.FromMilligramsPerMilliliter(kilogrampercubicmeter.MilligramsPerMilliliter).KilogramsPerCubicMeter, MilligramsPerMilliliterTolerance);

0 commit comments

Comments
 (0)