Skip to content

Commit d1b3ba4

Browse files
authored
Merge pull request #173 from massonib/fix/density
* Fix to the density conversions in the .json file * Updated conversions to be the same style. NEED TO RUN GenerateUnits.Bat
2 parents 8c7c9e5 + fc83586 commit d1b3ba4

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

UnitsNet/GeneratedCode/UnitClasses/Density.g.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public static DensityUnit BaseUnit
9898
/// </summary>
9999
public double KilogramsPerCubicCentimeter
100100
{
101-
get { return _kilogramsPerCubicMeter*0.00000001; }
101+
get { return _kilogramsPerCubicMeter*1e-6; }
102102
}
103103

104104
/// <summary>
@@ -114,7 +114,7 @@ public double KilogramsPerCubicMeter
114114
/// </summary>
115115
public double KilogramsPerCubicMillimeter
116116
{
117-
get { return _kilogramsPerCubicMeter*0.000000000001; }
117+
get { return _kilogramsPerCubicMeter*1e-9; }
118118
}
119119

120120
/// <summary>
@@ -154,7 +154,7 @@ public double PoundsPerCubicInch
154154
/// </summary>
155155
public double TonnesPerCubicCentimeter
156156
{
157-
get { return _kilogramsPerCubicMeter*0.00000000001; }
157+
get { return _kilogramsPerCubicMeter*1e-9; }
158158
}
159159

160160
/// <summary>
@@ -170,7 +170,7 @@ public double TonnesPerCubicMeter
170170
/// </summary>
171171
public double TonnesPerCubicMillimeter
172172
{
173-
get { return _kilogramsPerCubicMeter*0.000000000000001; }
173+
get { return _kilogramsPerCubicMeter*1e-12; }
174174
}
175175

176176
#endregion
@@ -187,7 +187,7 @@ public static Density Zero
187187
/// </summary>
188188
public static Density FromKilogramsPerCubicCentimeter(double kilogramspercubiccentimeter)
189189
{
190-
return new Density(kilogramspercubiccentimeter*100000000);
190+
return new Density(kilogramspercubiccentimeter*1e+6);
191191
}
192192

193193
/// <summary>
@@ -203,7 +203,7 @@ public static Density FromKilogramsPerCubicMeter(double kilogramspercubicmeter)
203203
/// </summary>
204204
public static Density FromKilogramsPerCubicMillimeter(double kilogramspercubicmillimeter)
205205
{
206-
return new Density(kilogramspercubicmillimeter*1000000000000);
206+
return new Density(kilogramspercubicmillimeter*1e+9);
207207
}
208208

209209
/// <summary>
@@ -243,7 +243,7 @@ public static Density FromPoundsPerCubicInch(double poundspercubicinch)
243243
/// </summary>
244244
public static Density FromTonnesPerCubicCentimeter(double tonnespercubiccentimeter)
245245
{
246-
return new Density(tonnespercubiccentimeter*100000000000);
246+
return new Density(tonnespercubiccentimeter*1e+9);
247247
}
248248

249249
/// <summary>
@@ -259,7 +259,7 @@ public static Density FromTonnesPerCubicMeter(double tonnespercubicmeter)
259259
/// </summary>
260260
public static Density FromTonnesPerCubicMillimeter(double tonnespercubicmillimeter)
261261
{
262-
return new Density(tonnespercubicmillimeter*1000000000000000);
262+
return new Density(tonnespercubicmillimeter*1e+12);
263263
}
264264

265265
#if !WINDOWS_UWP

UnitsNet/Scripts/UnitDefinitions/Density.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
{
88
"SingularName": "KilogramPerCubicMillimeter",
99
"PluralName": "KilogramsPerCubicMillimeter",
10-
"FromUnitToBaseFunc": "x*1000000000000",
11-
"FromBaseToUnitFunc": "x*0.000000000001",
10+
"FromUnitToBaseFunc": "x/1e-9",
11+
"FromBaseToUnitFunc": "x*1e-9",
1212
"Localization": [
1313
{
1414
"Culture": "en-US",
@@ -19,8 +19,8 @@
1919
{
2020
"SingularName": "KilogramPerCubicCentimeter",
2121
"PluralName": "KilogramsPerCubicCentimeter",
22-
"FromUnitToBaseFunc": "x*100000000",
23-
"FromBaseToUnitFunc": "x*0.00000001",
22+
"FromUnitToBaseFunc": "x/1e-6",
23+
"FromBaseToUnitFunc": "x*1e-6",
2424
"Localization": [
2525
{
2626
"Culture": "en-US",
@@ -47,8 +47,8 @@
4747
{
4848
"SingularName": "PoundPerCubicInch",
4949
"PluralName": "PoundsPerCubicInch",
50-
"FromUnitToBaseFunc": "x*27679.904710191",
51-
"FromBaseToUnitFunc": "x/27679.904710191",
50+
"FromUnitToBaseFunc": "x/3.6127298147753e-5",
51+
"FromBaseToUnitFunc": "x*3.6127298147753e-5",
5252
"Prefixes": [ "Kilo" ],
5353
"Localization": [
5454
{
@@ -75,8 +75,8 @@
7575
{
7676
"SingularName": "TonnePerCubicMillimeter",
7777
"PluralName": "TonnesPerCubicMillimeter",
78-
"FromUnitToBaseFunc": "x*1000000000000000",
79-
"FromBaseToUnitFunc": "x*0.000000000000001",
78+
"FromUnitToBaseFunc": "x/1e-9",
79+
"FromBaseToUnitFunc": "x*1e-12",
8080
"Localization": [
8181
{
8282
"Culture": "en-US",
@@ -87,8 +87,8 @@
8787
{
8888
"SingularName": "TonnePerCubicCentimeter",
8989
"PluralName": "TonnesPerCubicCentimeter",
90-
"FromUnitToBaseFunc": "x*100000000000",
91-
"FromBaseToUnitFunc": "x*0.00000000001",
90+
"FromUnitToBaseFunc": "x/1e-9",
91+
"FromBaseToUnitFunc": "x*1e-9",
9292
"Localization": [
9393
{
9494
"Culture": "en-US",
@@ -99,7 +99,7 @@
9999
{
100100
"SingularName": "TonnePerCubicMeter",
101101
"PluralName": "TonnesPerCubicMeter",
102-
"FromUnitToBaseFunc": "x*1000",
102+
"FromUnitToBaseFunc": "x/0.001",
103103
"FromBaseToUnitFunc": "x*0.001",
104104
"Localization": [
105105
{

0 commit comments

Comments
 (0)