Skip to content

Commit 249a570

Browse files
JenTechSystemsJenTechSystems
committed
Adding the "Milli" scal to ElectricalResitance unit.
1 parent 68bfddd commit 249a570

File tree

6 files changed

+84
-1
lines changed

6 files changed

+84
-1
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,13 @@ public abstract partial class ElectricResistanceTestsBase
5555
{
5656
protected abstract double KiloohmsInOneOhm { get; }
5757
protected abstract double MegaohmsInOneOhm { get; }
58+
protected abstract double MilliohmsInOneOhm { get; }
5859
protected abstract double OhmsInOneOhm { get; }
5960

6061
// ReSharper disable VirtualMemberNeverOverriden.Global
6162
protected virtual double KiloohmsTolerance { get { return 1e-5; } }
6263
protected virtual double MegaohmsTolerance { get { return 1e-5; } }
64+
protected virtual double MilliohmsTolerance { get { return 1e-5; } }
6365
protected virtual double OhmsTolerance { get { return 1e-5; } }
6466
// ReSharper restore VirtualMemberNeverOverriden.Global
6567

@@ -69,6 +71,7 @@ public void OhmToElectricResistanceUnits()
6971
ElectricResistance ohm = ElectricResistance.FromOhms(1);
7072
Assert.AreEqual(KiloohmsInOneOhm, ohm.Kiloohms, KiloohmsTolerance);
7173
Assert.AreEqual(MegaohmsInOneOhm, ohm.Megaohms, MegaohmsTolerance);
74+
Assert.AreEqual(MilliohmsInOneOhm, ohm.Milliohms, MilliohmsTolerance);
7275
Assert.AreEqual(OhmsInOneOhm, ohm.Ohms, OhmsTolerance);
7376
}
7477

@@ -77,6 +80,7 @@ public void FromValueAndUnit()
7780
{
7881
Assert.AreEqual(1, ElectricResistance.From(1, ElectricResistanceUnit.Kiloohm).Kiloohms, KiloohmsTolerance);
7982
Assert.AreEqual(1, ElectricResistance.From(1, ElectricResistanceUnit.Megaohm).Megaohms, MegaohmsTolerance);
83+
Assert.AreEqual(1, ElectricResistance.From(1, ElectricResistanceUnit.Milliohm).Milliohms, MilliohmsTolerance);
8084
Assert.AreEqual(1, ElectricResistance.From(1, ElectricResistanceUnit.Ohm).Ohms, OhmsTolerance);
8185
}
8286

@@ -86,6 +90,7 @@ public void As()
8690
var ohm = ElectricResistance.FromOhms(1);
8791
Assert.AreEqual(KiloohmsInOneOhm, ohm.As(ElectricResistanceUnit.Kiloohm), KiloohmsTolerance);
8892
Assert.AreEqual(MegaohmsInOneOhm, ohm.As(ElectricResistanceUnit.Megaohm), MegaohmsTolerance);
93+
Assert.AreEqual(MilliohmsInOneOhm, ohm.As(ElectricResistanceUnit.Milliohm), MilliohmsTolerance);
8994
Assert.AreEqual(OhmsInOneOhm, ohm.As(ElectricResistanceUnit.Ohm), OhmsTolerance);
9095
}
9196

@@ -95,6 +100,7 @@ public void ConversionRoundTrip()
95100
ElectricResistance ohm = ElectricResistance.FromOhms(1);
96101
Assert.AreEqual(1, ElectricResistance.FromKiloohms(ohm.Kiloohms).Ohms, KiloohmsTolerance);
97102
Assert.AreEqual(1, ElectricResistance.FromMegaohms(ohm.Megaohms).Ohms, MegaohmsTolerance);
103+
Assert.AreEqual(1, ElectricResistance.FromMilliohms(ohm.Milliohms).Ohms, MilliohmsTolerance);
98104
Assert.AreEqual(1, ElectricResistance.FromOhms(ohm.Ohms).Ohms, OhmsTolerance);
99105
}
100106

‎UnitsNet/GeneratedCode/Enums/ElectricResistanceUnit.g.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public enum ElectricResistanceUnit
4444
Undefined = 0,
4545
Kiloohm,
4646
Megaohm,
47+
Milliohm,
4748
Ohm,
4849
}
4950
}

‎UnitsNet/GeneratedCode/Extensions/Number/NumberToElectricResistanceExtensions.g.cs‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,40 @@ public static class NumberToElectricResistanceExtensions
112112

113113
#endregion
114114

115+
#region Milliohm
116+
117+
/// <inheritdoc cref="ElectricResistance.FromMilliohms(double)"/>
118+
public static ElectricResistance Milliohms(this int value) => ElectricResistance.FromMilliohms(value);
119+
120+
/// <inheritdoc cref="ElectricResistance.FromMilliohms(double?)"/>
121+
public static ElectricResistance? Milliohms(this int? value) => ElectricResistance.FromMilliohms(value);
122+
123+
/// <inheritdoc cref="ElectricResistance.FromMilliohms(double)"/>
124+
public static ElectricResistance Milliohms(this long value) => ElectricResistance.FromMilliohms(value);
125+
126+
/// <inheritdoc cref="ElectricResistance.FromMilliohms(double?)"/>
127+
public static ElectricResistance? Milliohms(this long? value) => ElectricResistance.FromMilliohms(value);
128+
129+
/// <inheritdoc cref="ElectricResistance.FromMilliohms(double)"/>
130+
public static ElectricResistance Milliohms(this double value) => ElectricResistance.FromMilliohms(value);
131+
132+
/// <inheritdoc cref="ElectricResistance.FromMilliohms(double?)"/>
133+
public static ElectricResistance? Milliohms(this double? value) => ElectricResistance.FromMilliohms(value);
134+
135+
/// <inheritdoc cref="ElectricResistance.FromMilliohms(double)"/>
136+
public static ElectricResistance Milliohms(this float value) => ElectricResistance.FromMilliohms(value);
137+
138+
/// <inheritdoc cref="ElectricResistance.FromMilliohms(double?)"/>
139+
public static ElectricResistance? Milliohms(this float? value) => ElectricResistance.FromMilliohms(value);
140+
141+
/// <inheritdoc cref="ElectricResistance.FromMilliohms(double)"/>
142+
public static ElectricResistance Milliohms(this decimal value) => ElectricResistance.FromMilliohms(Convert.ToDouble(value));
143+
144+
/// <inheritdoc cref="ElectricResistance.FromMilliohms(double?)"/>
145+
public static ElectricResistance? Milliohms(this decimal? value) => ElectricResistance.FromMilliohms(value == null ? (double?)null : Convert.ToDouble(value.Value));
146+
147+
#endregion
148+
115149
#region Ohm
116150

117151
/// <inheritdoc cref="ElectricResistance.FromOhms(double)"/>

‎UnitsNet/GeneratedCode/UnitClasses/ElectricResistance.g.cs‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,14 @@ public double Megaohms
126126
get { return (_ohms) / 1e6d; }
127127
}
128128

129+
/// <summary>
130+
/// Get ElectricResistance in Milliohms.
131+
/// </summary>
132+
public double Milliohms
133+
{
134+
get { return (_ohms) / 1e-3d; }
135+
}
136+
129137
/// <summary>
130138
/// Get ElectricResistance in Ohms.
131139
/// </summary>
@@ -159,6 +167,14 @@ public static ElectricResistance FromMegaohms(double megaohms)
159167
return new ElectricResistance((megaohms) * 1e6d);
160168
}
161169

170+
/// <summary>
171+
/// Get ElectricResistance from Milliohms.
172+
/// </summary>
173+
public static ElectricResistance FromMilliohms(double milliohms)
174+
{
175+
return new ElectricResistance((milliohms) * 1e-3d);
176+
}
177+
162178
/// <summary>
163179
/// Get ElectricResistance from Ohms.
164180
/// </summary>
@@ -198,6 +214,21 @@ public static ElectricResistance FromOhms(double ohms)
198214
}
199215
}
200216

217+
/// <summary>
218+
/// Get nullable ElectricResistance from nullable Milliohms.
219+
/// </summary>
220+
public static ElectricResistance? FromMilliohms(double? milliohms)
221+
{
222+
if (milliohms.HasValue)
223+
{
224+
return FromMilliohms(milliohms.Value);
225+
}
226+
else
227+
{
228+
return null;
229+
}
230+
}
231+
201232
/// <summary>
202233
/// Get nullable ElectricResistance from nullable Ohms.
203234
/// </summary>
@@ -229,6 +260,8 @@ public static ElectricResistance From(double val, ElectricResistanceUnit fromUni
229260
return FromKiloohms(val);
230261
case ElectricResistanceUnit.Megaohm:
231262
return FromMegaohms(val);
263+
case ElectricResistanceUnit.Milliohm:
264+
return FromMilliohms(val);
232265
case ElectricResistanceUnit.Ohm:
233266
return FromOhms(val);
234267

@@ -256,6 +289,8 @@ public static ElectricResistance From(double val, ElectricResistanceUnit fromUni
256289
return FromKiloohms(value.Value);
257290
case ElectricResistanceUnit.Megaohm:
258291
return FromMegaohms(value.Value);
292+
case ElectricResistanceUnit.Milliohm:
293+
return FromMilliohms(value.Value);
259294
case ElectricResistanceUnit.Ohm:
260295
return FromOhms(value.Value);
261296

@@ -416,6 +451,8 @@ public double As(ElectricResistanceUnit unit)
416451
return Kiloohms;
417452
case ElectricResistanceUnit.Megaohm:
418453
return Megaohms;
454+
case ElectricResistanceUnit.Milliohm:
455+
return Milliohms;
419456
case ElectricResistanceUnit.Ohm:
420457
return Ohms;
421458

‎UnitsNet/GeneratedCode/UnitSystem.Default.g.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,11 @@ private static readonly ReadOnlyCollection<UnitLocalization> DefaultLocalization
633633
{
634634
new AbbreviationsForCulture("en-US", "MΩ"),
635635
}),
636+
new CulturesForEnumValue((int) ElectricResistanceUnit.Milliohm,
637+
new[]
638+
{
639+
new AbbreviationsForCulture("en-US", "mΩ"),
640+
}),
636641
new CulturesForEnumValue((int) ElectricResistanceUnit.Ohm,
637642
new[]
638643
{

‎UnitsNet/UnitDefinitions/ElectricResistance.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"PluralName": "Ohms",
99
"FromUnitToBaseFunc": "x",
1010
"FromBaseToUnitFunc": "x",
11-
"Prefixes": [ "Kilo", "Mega" ],
11+
"Prefixes": [ "Milli", "Kilo", "Mega" ],
1212
"Localization": [
1313
{
1414
"Culture": "en-US",

0 commit comments

Comments
 (0)