Merge branch 'master'

point85 · Aug 28, 2021 · 19e4a7b · 19e4a7b
2 parents 3f01326 + 836fa01
commit 19e4a7b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/CaliperSharp/Prefix.cs b/CaliperSharp/Prefix.cs
@@ -41,7 +41,7 @@ public class Prefix
 		/// <summary> SI prefix 10^18 </summary>
 		public static readonly Prefix EXA = new Prefix("exa", "E", 1.0E+18);
 		/// <summary> SI prefix 10^15 </summary>
-		public static readonly Prefix PETA = new Prefix("petta", "P", 1.0E+15);
+		public static readonly Prefix PETA = new Prefix("peta", "P", 1.0E+15);
 		/// <summary> SI prefix 10^12 </summary>
 		public static readonly Prefix TERA = new Prefix("tera", "T", 1.0E+12);
 		/// <summary> SI prefix 10^9 </summary>

diff --git a/CaliperSharpTests/TestBridges.cs b/CaliperSharpTests/TestBridges.cs
@@ -221,5 +221,21 @@ public void TestBridgeUnits2()
 
 			}
 		}
+
+		[TestMethod]
+		public void TestBridgeUnits3()
+		{
+			UnitOfMeasure uomGrams = sys.GetUOM(Unit.GRAM);
+			UnitOfMeasure uomTonnes = sys.GetUOM(Unit.TONNE);
+			UnitOfMeasure uomShortTons = sys.GetUOM(Unit.US_TON);
+			UnitOfMeasure uomTroyOz = sys.GetUOM(Unit.TROY_OUNCE);
+			UnitOfMeasure uomPennyweight = sys.CreateScalarUOM(UnitType.MASS, "pennyweight", "dwt", "Pennyweight");
+			uomPennyweight.SetConversion(0.05, uomTroyOz);
+			UnitOfMeasure uomGramsPerTonne = sys.CreateQuotientUOM(uomGrams, uomTonnes);
+			UnitOfMeasure uomPennyweightPerShortTon = sys.CreateQuotientUOM(uomPennyweight, uomShortTons);
+			Quantity grade = new Quantity(0.95, uomGramsPerTonne);
+			Quantity converted = grade.Convert(uomPennyweightPerShortTon);
+			Assert.IsTrue(IsCloseTo(converted.Amount, 0.554167, DELTA6));
+		}
 	}
 }