Skip to content

Commit 407e72b

Browse files
tmilnthorpangularsen
authored andcommitted
Fix SingularName for some units in VolumeFlow (#494)
* Fix SingularName for some units in VolumeFlow * On second thought, MillionUsGallonsPerDay is appropiate since millions already defines a plurality
1 parent 5e8ac05 commit 407e72b

File tree

6 files changed

+176
-176
lines changed

6 files changed

+176
-176
lines changed

Common/GeneratedCode/Quantities/VolumeFlow.Common.g.cs

+60-60
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public static BaseDimensions BaseDimensions
127127
/// <summary>
128128
/// Get VolumeFlow in CentilitersPerMinute.
129129
/// </summary>
130-
public double CentilitersPerMinute => As(VolumeFlowUnit.CentilitersPerMinute);
130+
public double CentilitersPerMinute => As(VolumeFlowUnit.CentiliterPerMinute);
131131

132132
/// <summary>
133133
/// Get VolumeFlow in CubicDecimetersPerMinute.
@@ -182,37 +182,37 @@ public static BaseDimensions BaseDimensions
182182
/// <summary>
183183
/// Get VolumeFlow in DecilitersPerMinute.
184184
/// </summary>
185-
public double DecilitersPerMinute => As(VolumeFlowUnit.DecilitersPerMinute);
185+
public double DecilitersPerMinute => As(VolumeFlowUnit.DeciliterPerMinute);
186186

187187
/// <summary>
188188
/// Get VolumeFlow in KilolitersPerMinute.
189189
/// </summary>
190-
public double KilolitersPerMinute => As(VolumeFlowUnit.KilolitersPerMinute);
190+
public double KilolitersPerMinute => As(VolumeFlowUnit.KiloliterPerMinute);
191191

192192
/// <summary>
193193
/// Get VolumeFlow in LitersPerHour.
194194
/// </summary>
195-
public double LitersPerHour => As(VolumeFlowUnit.LitersPerHour);
195+
public double LitersPerHour => As(VolumeFlowUnit.LiterPerHour);
196196

197197
/// <summary>
198198
/// Get VolumeFlow in LitersPerMinute.
199199
/// </summary>
200-
public double LitersPerMinute => As(VolumeFlowUnit.LitersPerMinute);
200+
public double LitersPerMinute => As(VolumeFlowUnit.LiterPerMinute);
201201

202202
/// <summary>
203203
/// Get VolumeFlow in LitersPerSecond.
204204
/// </summary>
205-
public double LitersPerSecond => As(VolumeFlowUnit.LitersPerSecond);
205+
public double LitersPerSecond => As(VolumeFlowUnit.LiterPerSecond);
206206

207207
/// <summary>
208208
/// Get VolumeFlow in MicrolitersPerMinute.
209209
/// </summary>
210-
public double MicrolitersPerMinute => As(VolumeFlowUnit.MicrolitersPerMinute);
210+
public double MicrolitersPerMinute => As(VolumeFlowUnit.MicroliterPerMinute);
211211

212212
/// <summary>
213213
/// Get VolumeFlow in MillilitersPerMinute.
214214
/// </summary>
215-
public double MillilitersPerMinute => As(VolumeFlowUnit.MillilitersPerMinute);
215+
public double MillilitersPerMinute => As(VolumeFlowUnit.MilliliterPerMinute);
216216

217217
/// <summary>
218218
/// Get VolumeFlow in MillionUsGallonsPerDay.
@@ -222,37 +222,37 @@ public static BaseDimensions BaseDimensions
222222
/// <summary>
223223
/// Get VolumeFlow in NanolitersPerMinute.
224224
/// </summary>
225-
public double NanolitersPerMinute => As(VolumeFlowUnit.NanolitersPerMinute);
225+
public double NanolitersPerMinute => As(VolumeFlowUnit.NanoliterPerMinute);
226226

227227
/// <summary>
228228
/// Get VolumeFlow in OilBarrelsPerDay.
229229
/// </summary>
230-
public double OilBarrelsPerDay => As(VolumeFlowUnit.OilBarrelsPerDay);
230+
public double OilBarrelsPerDay => As(VolumeFlowUnit.OilBarrelPerDay);
231231

232232
/// <summary>
233233
/// Get VolumeFlow in OilBarrelsPerHour.
234234
/// </summary>
235-
public double OilBarrelsPerHour => As(VolumeFlowUnit.OilBarrelsPerHour);
235+
public double OilBarrelsPerHour => As(VolumeFlowUnit.OilBarrelPerHour);
236236

237237
/// <summary>
238238
/// Get VolumeFlow in OilBarrelsPerMinute.
239239
/// </summary>
240-
public double OilBarrelsPerMinute => As(VolumeFlowUnit.OilBarrelsPerMinute);
240+
public double OilBarrelsPerMinute => As(VolumeFlowUnit.OilBarrelPerMinute);
241241

242242
/// <summary>
243243
/// Get VolumeFlow in UsGallonsPerHour.
244244
/// </summary>
245-
public double UsGallonsPerHour => As(VolumeFlowUnit.UsGallonsPerHour);
245+
public double UsGallonsPerHour => As(VolumeFlowUnit.UsGallonPerHour);
246246

247247
/// <summary>
248248
/// Get VolumeFlow in UsGallonsPerMinute.
249249
/// </summary>
250-
public double UsGallonsPerMinute => As(VolumeFlowUnit.UsGallonsPerMinute);
250+
public double UsGallonsPerMinute => As(VolumeFlowUnit.UsGallonPerMinute);
251251

252252
/// <summary>
253253
/// Get VolumeFlow in UsGallonsPerSecond.
254254
/// </summary>
255-
public double UsGallonsPerSecond => As(VolumeFlowUnit.UsGallonsPerSecond);
255+
public double UsGallonsPerSecond => As(VolumeFlowUnit.UsGallonPerSecond);
256256

257257
#endregion
258258

@@ -274,7 +274,7 @@ public static VolumeFlow FromCentilitersPerMinute(QuantityValue centiliterspermi
274274
#endif
275275
{
276276
double value = (double) centilitersperminute;
277-
return new VolumeFlow(value, VolumeFlowUnit.CentilitersPerMinute);
277+
return new VolumeFlow(value, VolumeFlowUnit.CentiliterPerMinute);
278278
}
279279

280280
/// <summary>
@@ -428,7 +428,7 @@ public static VolumeFlow FromDecilitersPerMinute(QuantityValue decilitersperminu
428428
#endif
429429
{
430430
double value = (double) decilitersperminute;
431-
return new VolumeFlow(value, VolumeFlowUnit.DecilitersPerMinute);
431+
return new VolumeFlow(value, VolumeFlowUnit.DeciliterPerMinute);
432432
}
433433

434434
/// <summary>
@@ -442,7 +442,7 @@ public static VolumeFlow FromKilolitersPerMinute(QuantityValue kilolitersperminu
442442
#endif
443443
{
444444
double value = (double) kilolitersperminute;
445-
return new VolumeFlow(value, VolumeFlowUnit.KilolitersPerMinute);
445+
return new VolumeFlow(value, VolumeFlowUnit.KiloliterPerMinute);
446446
}
447447

448448
/// <summary>
@@ -456,7 +456,7 @@ public static VolumeFlow FromLitersPerHour(QuantityValue litersperhour)
456456
#endif
457457
{
458458
double value = (double) litersperhour;
459-
return new VolumeFlow(value, VolumeFlowUnit.LitersPerHour);
459+
return new VolumeFlow(value, VolumeFlowUnit.LiterPerHour);
460460
}
461461

462462
/// <summary>
@@ -470,7 +470,7 @@ public static VolumeFlow FromLitersPerMinute(QuantityValue litersperminute)
470470
#endif
471471
{
472472
double value = (double) litersperminute;
473-
return new VolumeFlow(value, VolumeFlowUnit.LitersPerMinute);
473+
return new VolumeFlow(value, VolumeFlowUnit.LiterPerMinute);
474474
}
475475

476476
/// <summary>
@@ -484,7 +484,7 @@ public static VolumeFlow FromLitersPerSecond(QuantityValue literspersecond)
484484
#endif
485485
{
486486
double value = (double) literspersecond;
487-
return new VolumeFlow(value, VolumeFlowUnit.LitersPerSecond);
487+
return new VolumeFlow(value, VolumeFlowUnit.LiterPerSecond);
488488
}
489489

490490
/// <summary>
@@ -498,7 +498,7 @@ public static VolumeFlow FromMicrolitersPerMinute(QuantityValue microliterspermi
498498
#endif
499499
{
500500
double value = (double) microlitersperminute;
501-
return new VolumeFlow(value, VolumeFlowUnit.MicrolitersPerMinute);
501+
return new VolumeFlow(value, VolumeFlowUnit.MicroliterPerMinute);
502502
}
503503

504504
/// <summary>
@@ -512,7 +512,7 @@ public static VolumeFlow FromMillilitersPerMinute(QuantityValue milliliterspermi
512512
#endif
513513
{
514514
double value = (double) millilitersperminute;
515-
return new VolumeFlow(value, VolumeFlowUnit.MillilitersPerMinute);
515+
return new VolumeFlow(value, VolumeFlowUnit.MilliliterPerMinute);
516516
}
517517

518518
/// <summary>
@@ -540,7 +540,7 @@ public static VolumeFlow FromNanolitersPerMinute(QuantityValue nanolitersperminu
540540
#endif
541541
{
542542
double value = (double) nanolitersperminute;
543-
return new VolumeFlow(value, VolumeFlowUnit.NanolitersPerMinute);
543+
return new VolumeFlow(value, VolumeFlowUnit.NanoliterPerMinute);
544544
}
545545

546546
/// <summary>
@@ -554,7 +554,7 @@ public static VolumeFlow FromOilBarrelsPerDay(QuantityValue oilbarrelsperday)
554554
#endif
555555
{
556556
double value = (double) oilbarrelsperday;
557-
return new VolumeFlow(value, VolumeFlowUnit.OilBarrelsPerDay);
557+
return new VolumeFlow(value, VolumeFlowUnit.OilBarrelPerDay);
558558
}
559559

560560
/// <summary>
@@ -568,7 +568,7 @@ public static VolumeFlow FromOilBarrelsPerHour(QuantityValue oilbarrelsperhour)
568568
#endif
569569
{
570570
double value = (double) oilbarrelsperhour;
571-
return new VolumeFlow(value, VolumeFlowUnit.OilBarrelsPerHour);
571+
return new VolumeFlow(value, VolumeFlowUnit.OilBarrelPerHour);
572572
}
573573

574574
/// <summary>
@@ -582,7 +582,7 @@ public static VolumeFlow FromOilBarrelsPerMinute(QuantityValue oilbarrelsperminu
582582
#endif
583583
{
584584
double value = (double) oilbarrelsperminute;
585-
return new VolumeFlow(value, VolumeFlowUnit.OilBarrelsPerMinute);
585+
return new VolumeFlow(value, VolumeFlowUnit.OilBarrelPerMinute);
586586
}
587587

588588
/// <summary>
@@ -596,7 +596,7 @@ public static VolumeFlow FromUsGallonsPerHour(QuantityValue usgallonsperhour)
596596
#endif
597597
{
598598
double value = (double) usgallonsperhour;
599-
return new VolumeFlow(value, VolumeFlowUnit.UsGallonsPerHour);
599+
return new VolumeFlow(value, VolumeFlowUnit.UsGallonPerHour);
600600
}
601601

602602
/// <summary>
@@ -610,7 +610,7 @@ public static VolumeFlow FromUsGallonsPerMinute(QuantityValue usgallonsperminute
610610
#endif
611611
{
612612
double value = (double) usgallonsperminute;
613-
return new VolumeFlow(value, VolumeFlowUnit.UsGallonsPerMinute);
613+
return new VolumeFlow(value, VolumeFlowUnit.UsGallonPerMinute);
614614
}
615615

616616
/// <summary>
@@ -624,7 +624,7 @@ public static VolumeFlow FromUsGallonsPerSecond(QuantityValue usgallonspersecond
624624
#endif
625625
{
626626
double value = (double) usgallonspersecond;
627-
return new VolumeFlow(value, VolumeFlowUnit.UsGallonsPerSecond);
627+
return new VolumeFlow(value, VolumeFlowUnit.UsGallonPerSecond);
628628
}
629629

630630

@@ -775,7 +775,7 @@ private double AsBaseUnit()
775775
{
776776
switch(Unit)
777777
{
778-
case VolumeFlowUnit.CentilitersPerMinute: return (_value/60000.00000) * 1e-2d;
778+
case VolumeFlowUnit.CentiliterPerMinute: return (_value/60000.00000) * 1e-2d;
779779
case VolumeFlowUnit.CubicDecimeterPerMinute: return _value/60000.00000;
780780
case VolumeFlowUnit.CubicFootPerHour: return _value*7.8657907199999087346816086183876e-6;
781781
case VolumeFlowUnit.CubicFootPerMinute: return _value/2118.88000326;
@@ -786,21 +786,21 @@ private double AsBaseUnit()
786786
case VolumeFlowUnit.CubicYardPerHour: return _value*2.1237634944E-4;
787787
case VolumeFlowUnit.CubicYardPerMinute: return _value*0.0127425809664;
788788
case VolumeFlowUnit.CubicYardPerSecond: return _value*0.764554857984;
789-
case VolumeFlowUnit.DecilitersPerMinute: return (_value/60000.00000) * 1e-1d;
790-
case VolumeFlowUnit.KilolitersPerMinute: return (_value/60000.00000) * 1e3d;
791-
case VolumeFlowUnit.LitersPerHour: return _value/3600000.000;
792-
case VolumeFlowUnit.LitersPerMinute: return _value/60000.00000;
793-
case VolumeFlowUnit.LitersPerSecond: return _value/1000;
794-
case VolumeFlowUnit.MicrolitersPerMinute: return (_value/60000.00000) * 1e-6d;
795-
case VolumeFlowUnit.MillilitersPerMinute: return (_value/60000.00000) * 1e-3d;
789+
case VolumeFlowUnit.DeciliterPerMinute: return (_value/60000.00000) * 1e-1d;
790+
case VolumeFlowUnit.KiloliterPerMinute: return (_value/60000.00000) * 1e3d;
791+
case VolumeFlowUnit.LiterPerHour: return _value/3600000.000;
792+
case VolumeFlowUnit.LiterPerMinute: return _value/60000.00000;
793+
case VolumeFlowUnit.LiterPerSecond: return _value/1000;
794+
case VolumeFlowUnit.MicroliterPerMinute: return (_value/60000.00000) * 1e-6d;
795+
case VolumeFlowUnit.MilliliterPerMinute: return (_value/60000.00000) * 1e-3d;
796796
case VolumeFlowUnit.MillionUsGallonsPerDay: return _value/22.824465227;
797-
case VolumeFlowUnit.NanolitersPerMinute: return (_value/60000.00000) * 1e-9d;
798-
case VolumeFlowUnit.OilBarrelsPerDay: return _value*1.8401307283333333333333333333333e-6;
799-
case VolumeFlowUnit.OilBarrelsPerHour: return _value*4.41631375e-5;
800-
case VolumeFlowUnit.OilBarrelsPerMinute: return _value*2.64978825e-3;
801-
case VolumeFlowUnit.UsGallonsPerHour: return _value/951019.38848933424;
802-
case VolumeFlowUnit.UsGallonsPerMinute: return _value/15850.323141489;
803-
case VolumeFlowUnit.UsGallonsPerSecond: return _value/264.1720523581484;
797+
case VolumeFlowUnit.NanoliterPerMinute: return (_value/60000.00000) * 1e-9d;
798+
case VolumeFlowUnit.OilBarrelPerDay: return _value*1.8401307283333333333333333333333e-6;
799+
case VolumeFlowUnit.OilBarrelPerHour: return _value*4.41631375e-5;
800+
case VolumeFlowUnit.OilBarrelPerMinute: return _value*2.64978825e-3;
801+
case VolumeFlowUnit.UsGallonPerHour: return _value/951019.38848933424;
802+
case VolumeFlowUnit.UsGallonPerMinute: return _value/15850.323141489;
803+
case VolumeFlowUnit.UsGallonPerSecond: return _value/264.1720523581484;
804804
default:
805805
throw new NotImplementedException($"Can not convert {Unit} to base units.");
806806
}
@@ -815,7 +815,7 @@ private double AsBaseNumericType(VolumeFlowUnit unit)
815815

816816
switch(unit)
817817
{
818-
case VolumeFlowUnit.CentilitersPerMinute: return (baseUnitValue*60000.00000) / 1e-2d;
818+
case VolumeFlowUnit.CentiliterPerMinute: return (baseUnitValue*60000.00000) / 1e-2d;
819819
case VolumeFlowUnit.CubicDecimeterPerMinute: return baseUnitValue*60000.00000;
820820
case VolumeFlowUnit.CubicFootPerHour: return baseUnitValue/7.8657907199999087346816086183876e-6;
821821
case VolumeFlowUnit.CubicFootPerMinute: return baseUnitValue*2118.88000326;
@@ -826,21 +826,21 @@ private double AsBaseNumericType(VolumeFlowUnit unit)
826826
case VolumeFlowUnit.CubicYardPerHour: return baseUnitValue/2.1237634944E-4;
827827
case VolumeFlowUnit.CubicYardPerMinute: return baseUnitValue/0.0127425809664;
828828
case VolumeFlowUnit.CubicYardPerSecond: return baseUnitValue/0.764554857984;
829-
case VolumeFlowUnit.DecilitersPerMinute: return (baseUnitValue*60000.00000) / 1e-1d;
830-
case VolumeFlowUnit.KilolitersPerMinute: return (baseUnitValue*60000.00000) / 1e3d;
831-
case VolumeFlowUnit.LitersPerHour: return baseUnitValue*3600000.000;
832-
case VolumeFlowUnit.LitersPerMinute: return baseUnitValue*60000.00000;
833-
case VolumeFlowUnit.LitersPerSecond: return baseUnitValue*1000;
834-
case VolumeFlowUnit.MicrolitersPerMinute: return (baseUnitValue*60000.00000) / 1e-6d;
835-
case VolumeFlowUnit.MillilitersPerMinute: return (baseUnitValue*60000.00000) / 1e-3d;
829+
case VolumeFlowUnit.DeciliterPerMinute: return (baseUnitValue*60000.00000) / 1e-1d;
830+
case VolumeFlowUnit.KiloliterPerMinute: return (baseUnitValue*60000.00000) / 1e3d;
831+
case VolumeFlowUnit.LiterPerHour: return baseUnitValue*3600000.000;
832+
case VolumeFlowUnit.LiterPerMinute: return baseUnitValue*60000.00000;
833+
case VolumeFlowUnit.LiterPerSecond: return baseUnitValue*1000;
834+
case VolumeFlowUnit.MicroliterPerMinute: return (baseUnitValue*60000.00000) / 1e-6d;
835+
case VolumeFlowUnit.MilliliterPerMinute: return (baseUnitValue*60000.00000) / 1e-3d;
836836
case VolumeFlowUnit.MillionUsGallonsPerDay: return baseUnitValue*22.824465227;
837-
case VolumeFlowUnit.NanolitersPerMinute: return (baseUnitValue*60000.00000) / 1e-9d;
838-
case VolumeFlowUnit.OilBarrelsPerDay: return baseUnitValue/1.8401307283333333333333333333333e-6;
839-
case VolumeFlowUnit.OilBarrelsPerHour: return baseUnitValue/4.41631375e-5;
840-
case VolumeFlowUnit.OilBarrelsPerMinute: return baseUnitValue/2.64978825e-3;
841-
case VolumeFlowUnit.UsGallonsPerHour: return baseUnitValue*951019.38848933424;
842-
case VolumeFlowUnit.UsGallonsPerMinute: return baseUnitValue*15850.323141489;
843-
case VolumeFlowUnit.UsGallonsPerSecond: return baseUnitValue*264.1720523581484;
837+
case VolumeFlowUnit.NanoliterPerMinute: return (baseUnitValue*60000.00000) / 1e-9d;
838+
case VolumeFlowUnit.OilBarrelPerDay: return baseUnitValue/1.8401307283333333333333333333333e-6;
839+
case VolumeFlowUnit.OilBarrelPerHour: return baseUnitValue/4.41631375e-5;
840+
case VolumeFlowUnit.OilBarrelPerMinute: return baseUnitValue/2.64978825e-3;
841+
case VolumeFlowUnit.UsGallonPerHour: return baseUnitValue*951019.38848933424;
842+
case VolumeFlowUnit.UsGallonPerMinute: return baseUnitValue*15850.323141489;
843+
case VolumeFlowUnit.UsGallonPerSecond: return baseUnitValue*264.1720523581484;
844844
default:
845845
throw new NotImplementedException($"Can not convert {Unit} to {unit}.");
846846
}

0 commit comments

Comments
 (0)