-
Notifications
You must be signed in to change notification settings - Fork 387
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update the ToString format of the BaseUnits/Dimensions (#1486)
- `BaseUnits`: no longer using the `AbbeviationsCache`, the new format is `L=Meter, M=Kilogram, T=Second` - `BaseDimensions`: the exponent moved inside the dimension-brackets: `[Length][Time^-1]` - `BaseDimensions`: minor performance improvements As mentioned in #1452, the main motivation here is the removal of the potential side effects of accessing/loading the unit abbreviations (e.g. during the `QuantityInfo` construction)
- Loading branch information
Showing
4 changed files
with
80 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
| // Copyright 2013 Andreas Gullberg Larsen ([email protected]). Maintained at https://github.com/angularsen/UnitsNet. | ||
|
|
||
| using System; | ||
| using System.Text; | ||
| using System.Collections.Generic; | ||
| using UnitsNet.Units; | ||
|
|
||
| namespace UnitsNet | ||
|
|
@@ -103,11 +103,11 @@ public bool IsSubsetOf(BaseUnits other) | |
| /// <inheritdoc /> | ||
| public override int GetHashCode() | ||
| { | ||
| #if NET | ||
| #if NET | ||
| return HashCode.Combine(Length, Mass, Time, Current, Temperature, Amount, LuminousIntensity); | ||
| #else | ||
| #else | ||
| return new {Length, Mass, Time, Current, Temperature, Amount, LuminousIntensity}.GetHashCode(); | ||
| #endif | ||
| #endif | ||
| } | ||
|
|
||
| /// <summary> | ||
|
|
@@ -133,31 +133,47 @@ public override int GetHashCode() | |
| { | ||
| return !(left == right); | ||
| } | ||
|
|
||
| /// <inheritdoc /> | ||
| public override string ToString() | ||
| { | ||
| if(!Equals(Undefined)) | ||
| if (Equals(Undefined)) | ||
| { | ||
| var sb = new StringBuilder(); | ||
|
|
||
| string GetDefaultAbbreviation<TUnitType>(TUnitType? unitOrNull) where TUnitType : struct, Enum => unitOrNull is { } unit | ||
| ? UnitsNetSetup.Default.UnitAbbreviations.GetDefaultAbbreviation(unit) | ||
| : "N/A"; | ||
| return "Undefined"; | ||
| } | ||
|
|
||
| sb.AppendFormat("[Length]: {0}, ", GetDefaultAbbreviation(Length)); | ||
| sb.AppendFormat("[Mass]: {0}, ", GetDefaultAbbreviation(Mass)); | ||
| sb.AppendFormat("[Time]: {0}, ", GetDefaultAbbreviation(Time)); | ||
| sb.AppendFormat("[Current]: {0}, ", GetDefaultAbbreviation(Current)); | ||
| sb.AppendFormat("[Temperature]: {0}, ", GetDefaultAbbreviation(Temperature)); | ||
| sb.AppendFormat("[Amount]: {0}, ", GetDefaultAbbreviation(Amount)); | ||
| sb.AppendFormat("[LuminousIntensity]: {0}", GetDefaultAbbreviation(LuminousIntensity)); | ||
| return string.Join(", ", GetUnitsDefined()); | ||
|
|
||
| return sb.ToString(); | ||
| } | ||
| else | ||
| IEnumerable<string> GetUnitsDefined() | ||
| { | ||
| return "Undefined"; | ||
| if (Length is not null) | ||
| { | ||
| yield return $"L={Length}"; | ||
| } | ||
| if (Mass is not null) | ||
| { | ||
| yield return $"M={Mass}"; | ||
| } | ||
| if (Time is not null) | ||
| { | ||
| yield return $"T={Time}"; | ||
| } | ||
| if (Current is not null) | ||
| { | ||
| yield return $"I={Current}"; | ||
| } | ||
| if (Temperature is not null) | ||
| { | ||
| yield return $"Θ={Temperature}"; | ||
| } | ||
| if (Amount is not null) | ||
| { | ||
| yield return $"N={Amount}"; | ||
| } | ||
| if (LuminousIntensity is not null) | ||
| { | ||
| yield return $"J={LuminousIntensity}"; | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -200,8 +216,8 @@ string GetDefaultAbbreviation<TUnitType>(TUnitType? unitOrNull) where TUnitType | |
| /// Gets a value indicating whether all base units are defined. | ||
| /// </summary> | ||
| /// <remarks> | ||
| /// This property returns <c>true</c> if all seven base units | ||
| /// (Length, Mass, Time, Current, Temperature, Amount, and LuminousIntensity) | ||
| /// This property returns <c>true</c> if all seven base units | ||
| /// (Length, Mass, Time, Current, Temperature, Amount, and LuminousIntensity) | ||
| /// are non-null; otherwise, it returns <c>false</c>. | ||
| /// </remarks> | ||
| public bool IsFullyDefined => Length is not null && | ||
|
|
||