Skip to content

Splitting UnitSystem class into more focused classes #511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
angularsen merged 12 commits into from
Oct 13, 2018
Merged

Splitting UnitSystem class into more focused classes #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1bf14a8
Splitting UnitSystem class into more focused classes
tmilnthorp Oct 11, 2018
79ce236
tmilnthorp Oct 11, 2018
f9c6790
tmilnthorp Oct 11, 2018
1ada74a
tmilnthorp Oct 12, 2018
4a67832
tmilnthorp Oct 12, 2018
6d86563
tmilnthorp Oct 12, 2018
6af3595
Merge branch 'v4' into UnitSystemSplit
tmilnthorp Oct 12, 2018
2d9e9c2
tmilnthorp Oct 12, 2018
e429c29
tmilnthorp Oct 12, 2018
53ba68d
tmilnthorp Oct 12, 2018
8dd5866
tmilnthorp Oct 12, 2018
b7523d2
tmilnthorp Oct 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 10 additions & 12 deletions Common/GeneratedCode/Quantities/Acceleration.Common.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ public static bool TryParseUnit(string str, out AccelerationUnit unit)
/// Parse a string with one or two quantities of the format "<quantity> <unit>".
/// </summary>
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
/// <example>
/// Length.Parse("5.5 m", new CultureInfo("en-US"));
/// </example>
Expand All @@ -677,17 +677,17 @@ private static Acceleration ParseInternal(string str, [CanBeNull] IFormatProvide
{
if (str == null) throw new ArgumentNullException(nameof(str));

provider = provider ?? UnitSystem.DefaultCulture;
provider = provider ?? GlobalConfiguration.DefaultCulture;

return QuantityParser.Parse<Acceleration, AccelerationUnit>(str, provider, ParseUnitInternal, From,
return QuantityParser.Default.Parse<Acceleration, AccelerationUnit>(str, provider, ParseUnitInternal, From,
(x, y) => From(x.MetersPerSecondSquared + y.MetersPerSecondSquared, BaseUnit));
}

/// <summary>
/// Try to parse a string with one or two quantities of the format "&lt;quantity&gt; &lt;unit&gt;".
/// </summary>
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
/// <param name="result">Resulting unit quantity if successful.</param>
/// <returns>True if successful, otherwise false.</returns>
/// <example>
Expand All @@ -700,17 +700,17 @@ private static bool TryParseInternal([CanBeNull] string str, [CanBeNull] IFormat
if(string.IsNullOrWhiteSpace(str))
return false;

provider = provider ?? UnitSystem.DefaultCulture;
provider = provider ?? GlobalConfiguration.DefaultCulture;

return QuantityParser.TryParse<Acceleration, AccelerationUnit>(str, provider, TryParseUnitInternal, From,
return QuantityParser.Default.TryParse<Acceleration, AccelerationUnit>(str, provider, TryParseUnitInternal, From,
(x, y) => From(x.MetersPerSecondSquared + y.MetersPerSecondSquared, BaseUnit), out result);
}

/// <summary>
/// Parse a unit string.
/// </summary>
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
/// <example>
/// Length.ParseUnit("m", new CultureInfo("en-US"));
/// </example>
Expand All @@ -720,8 +720,7 @@ private static AccelerationUnit ParseUnitInternal(string str, IFormatProvider pr
{
if (str == null) throw new ArgumentNullException(nameof(str));

var unitSystem = UnitSystem.GetCached(provider);
var unit = unitSystem.Parse<AccelerationUnit>(str.Trim());
var unit = UnitParser.Default.Parse<AccelerationUnit>(str.Trim(), provider);

if (unit == AccelerationUnit.Undefined)
{
Expand All @@ -738,7 +737,7 @@ private static AccelerationUnit ParseUnitInternal(string str, IFormatProvider pr
/// Parse a unit string.
/// </summary>
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
/// <param name="unit">The parsed unit if successful.</param>
/// <returns>True if successful, otherwise false.</returns>
/// <example>
Expand All @@ -751,8 +750,7 @@ private static bool TryParseUnitInternal(string str, IFormatProvider provider, o
if(string.IsNullOrWhiteSpace(str))
return false;

var unitSystem = UnitSystem.GetCached(provider);
if(!unitSystem.TryParse<AccelerationUnit>(str.Trim(), out unit))
if(!UnitParser.Default.TryParse<AccelerationUnit>(str.Trim(), provider, out unit))
return false;

if(unit == AccelerationUnit.Undefined)
Expand Down
22 changes: 10 additions & 12 deletions Common/GeneratedCode/Quantities/AmountOfSubstance.Common.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ public static bool TryParseUnit(string str, out AmountOfSubstanceUnit unit)
/// Parse a string with one or two quantities of the format "&lt;quantity&gt; &lt;unit&gt;".
/// </summary>
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
/// <example>
/// Length.Parse("5.5 m", new CultureInfo("en-US"));
/// </example>
Expand All @@ -699,17 +699,17 @@ private static AmountOfSubstance ParseInternal(string str, [CanBeNull] IFormatPr
{
if (str == null) throw new ArgumentNullException(nameof(str));

provider = provider ?? UnitSystem.DefaultCulture;
provider = provider ?? GlobalConfiguration.DefaultCulture;

return QuantityParser.Parse<AmountOfSubstance, AmountOfSubstanceUnit>(str, provider, ParseUnitInternal, From,
return QuantityParser.Default.Parse<AmountOfSubstance, AmountOfSubstanceUnit>(str, provider, ParseUnitInternal, From,
(x, y) => From(x.Moles + y.Moles, BaseUnit));
}

/// <summary>
/// Try to parse a string with one or two quantities of the format "&lt;quantity&gt; &lt;unit&gt;".
/// </summary>
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
/// <param name="result">Resulting unit quantity if successful.</param>
/// <returns>True if successful, otherwise false.</returns>
/// <example>
Expand All @@ -722,17 +722,17 @@ private static bool TryParseInternal([CanBeNull] string str, [CanBeNull] IFormat
if(string.IsNullOrWhiteSpace(str))
return false;

provider = provider ?? UnitSystem.DefaultCulture;
provider = provider ?? GlobalConfiguration.DefaultCulture;

return QuantityParser.TryParse<AmountOfSubstance, AmountOfSubstanceUnit>(str, provider, TryParseUnitInternal, From,
return QuantityParser.Default.TryParse<AmountOfSubstance, AmountOfSubstanceUnit>(str, provider, TryParseUnitInternal, From,
(x, y) => From(x.Moles + y.Moles, BaseUnit), out result);
}

/// <summary>
/// Parse a unit string.
/// </summary>
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
/// <example>
/// Length.ParseUnit("m", new CultureInfo("en-US"));
/// </example>
Expand All @@ -742,8 +742,7 @@ private static AmountOfSubstanceUnit ParseUnitInternal(string str, IFormatProvid
{
if (str == null) throw new ArgumentNullException(nameof(str));

var unitSystem = UnitSystem.GetCached(provider);
var unit = unitSystem.Parse<AmountOfSubstanceUnit>(str.Trim());
var unit = UnitParser.Default.Parse<AmountOfSubstanceUnit>(str.Trim(), provider);

if (unit == AmountOfSubstanceUnit.Undefined)
{
Expand All @@ -760,7 +759,7 @@ private static AmountOfSubstanceUnit ParseUnitInternal(string str, IFormatProvid
/// Parse a unit string.
/// </summary>
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
/// <param name="unit">The parsed unit if successful.</param>
/// <returns>True if successful, otherwise false.</returns>
/// <example>
Expand All @@ -773,8 +772,7 @@ private static bool TryParseUnitInternal(string str, IFormatProvider provider, o
if(string.IsNullOrWhiteSpace(str))
return false;

var unitSystem = UnitSystem.GetCached(provider);
if(!unitSystem.TryParse<AmountOfSubstanceUnit>(str.Trim(), out unit))
if(!UnitParser.Default.TryParse<AmountOfSubstanceUnit>(str.Trim(), provider, out unit))
return false;

if(unit == AmountOfSubstanceUnit.Undefined)
Expand Down
22 changes: 10 additions & 12 deletions Common/GeneratedCode/Quantities/AmplitudeRatio.Common.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ public static bool TryParseUnit(string str, out AmplitudeRatioUnit unit)
/// Parse a string with one or two quantities of the format "&lt;quantity&gt; &lt;unit&gt;".
/// </summary>
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
/// <example>
/// Length.Parse("5.5 m", new CultureInfo("en-US"));
/// </example>
Expand All @@ -478,17 +478,17 @@ private static AmplitudeRatio ParseInternal(string str, [CanBeNull] IFormatProvi
{
if (str == null) throw new ArgumentNullException(nameof(str));

provider = provider ?? UnitSystem.DefaultCulture;
provider = provider ?? GlobalConfiguration.DefaultCulture;

return QuantityParser.Parse<AmplitudeRatio, AmplitudeRatioUnit>(str, provider, ParseUnitInternal, From,
return QuantityParser.Default.Parse<AmplitudeRatio, AmplitudeRatioUnit>(str, provider, ParseUnitInternal, From,
(x, y) => From(x.DecibelVolts + y.DecibelVolts, BaseUnit));
}

/// <summary>
/// Try to parse a string with one or two quantities of the format "&lt;quantity&gt; &lt;unit&gt;".
/// </summary>
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
/// <param name="result">Resulting unit quantity if successful.</param>
/// <returns>True if successful, otherwise false.</returns>
/// <example>
Expand All @@ -501,17 +501,17 @@ private static bool TryParseInternal([CanBeNull] string str, [CanBeNull] IFormat
if(string.IsNullOrWhiteSpace(str))
return false;

provider = provider ?? UnitSystem.DefaultCulture;
provider = provider ?? GlobalConfiguration.DefaultCulture;

return QuantityParser.TryParse<AmplitudeRatio, AmplitudeRatioUnit>(str, provider, TryParseUnitInternal, From,
return QuantityParser.Default.TryParse<AmplitudeRatio, AmplitudeRatioUnit>(str, provider, TryParseUnitInternal, From,
(x, y) => From(x.DecibelVolts + y.DecibelVolts, BaseUnit), out result);
}

/// <summary>
/// Parse a unit string.
/// </summary>
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
/// <example>
/// Length.ParseUnit("m", new CultureInfo("en-US"));
/// </example>
Expand All @@ -521,8 +521,7 @@ private static AmplitudeRatioUnit ParseUnitInternal(string str, IFormatProvider
{
if (str == null) throw new ArgumentNullException(nameof(str));

var unitSystem = UnitSystem.GetCached(provider);
var unit = unitSystem.Parse<AmplitudeRatioUnit>(str.Trim());
var unit = UnitParser.Default.Parse<AmplitudeRatioUnit>(str.Trim(), provider);

if (unit == AmplitudeRatioUnit.Undefined)
{
Expand All @@ -539,7 +538,7 @@ private static AmplitudeRatioUnit ParseUnitInternal(string str, IFormatProvider
/// Parse a unit string.
/// </summary>
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
/// <param name="unit">The parsed unit if successful.</param>
/// <returns>True if successful, otherwise false.</returns>
/// <example>
Expand All @@ -552,8 +551,7 @@ private static bool TryParseUnitInternal(string str, IFormatProvider provider, o
if(string.IsNullOrWhiteSpace(str))
return false;

var unitSystem = UnitSystem.GetCached(provider);
if(!unitSystem.TryParse<AmplitudeRatioUnit>(str.Trim(), out unit))
if(!UnitParser.Default.TryParse<AmplitudeRatioUnit>(str.Trim(), provider, out unit))
return false;

if(unit == AmplitudeRatioUnit.Undefined)
Expand Down
22 changes: 10 additions & 12 deletions Common/GeneratedCode/Quantities/Angle.Common.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ public static bool TryParseUnit(string str, out AngleUnit unit)
/// Parse a string with one or two quantities of the format "&lt;quantity&gt; &lt;unit&gt;".
/// </summary>
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
/// <example>
/// Length.Parse("5.5 m", new CultureInfo("en-US"));
/// </example>
Expand All @@ -698,17 +698,17 @@ private static Angle ParseInternal(string str, [CanBeNull] IFormatProvider provi
{
if (str == null) throw new ArgumentNullException(nameof(str));

provider = provider ?? UnitSystem.DefaultCulture;
provider = provider ?? GlobalConfiguration.DefaultCulture;

return QuantityParser.Parse<Angle, AngleUnit>(str, provider, ParseUnitInternal, From,
return QuantityParser.Default.Parse<Angle, AngleUnit>(str, provider, ParseUnitInternal, From,
(x, y) => From(x.Degrees + y.Degrees, BaseUnit));
}

/// <summary>
/// Try to parse a string with one or two quantities of the format "&lt;quantity&gt; &lt;unit&gt;".
/// </summary>
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
/// <param name="result">Resulting unit quantity if successful.</param>
/// <returns>True if successful, otherwise false.</returns>
/// <example>
Expand All @@ -721,17 +721,17 @@ private static bool TryParseInternal([CanBeNull] string str, [CanBeNull] IFormat
if(string.IsNullOrWhiteSpace(str))
return false;

provider = provider ?? UnitSystem.DefaultCulture;
provider = provider ?? GlobalConfiguration.DefaultCulture;

return QuantityParser.TryParse<Angle, AngleUnit>(str, provider, TryParseUnitInternal, From,
return QuantityParser.Default.TryParse<Angle, AngleUnit>(str, provider, TryParseUnitInternal, From,
(x, y) => From(x.Degrees + y.Degrees, BaseUnit), out result);
}

/// <summary>
/// Parse a unit string.
/// </summary>
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
/// <example>
/// Length.ParseUnit("m", new CultureInfo("en-US"));
/// </example>
Expand All @@ -741,8 +741,7 @@ private static AngleUnit ParseUnitInternal(string str, IFormatProvider provider
{
if (str == null) throw new ArgumentNullException(nameof(str));

var unitSystem = UnitSystem.GetCached(provider);
var unit = unitSystem.Parse<AngleUnit>(str.Trim());
var unit = UnitParser.Default.Parse<AngleUnit>(str.Trim(), provider);

if (unit == AngleUnit.Undefined)
{
Expand All @@ -759,7 +758,7 @@ private static AngleUnit ParseUnitInternal(string str, IFormatProvider provider
/// Parse a unit string.
/// </summary>
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
/// <param name="unit">The parsed unit if successful.</param>
/// <returns>True if successful, otherwise false.</returns>
/// <example>
Expand All @@ -772,8 +771,7 @@ private static bool TryParseUnitInternal(string str, IFormatProvider provider, o
if(string.IsNullOrWhiteSpace(str))
return false;

var unitSystem = UnitSystem.GetCached(provider);
if(!unitSystem.TryParse<AngleUnit>(str.Trim(), out unit))
if(!UnitParser.Default.TryParse<AngleUnit>(str.Trim(), provider, out unit))
return false;

if(unit == AngleUnit.Undefined)
Expand Down
Loading