#491 - Add Temperature and Mass Units support to ToNumber function. (#…

…503)
sys27 · Feb 15, 2022 · 920cce5 · 920cce5
1 parent b46dbb7
commit 920cce5
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 1 deletion.
diff --git a/xFunc.Maths/Analyzers/TypeAnalyzers/TypeAnalyzer.cs b/xFunc.Maths/Analyzers/TypeAnalyzers/TypeAnalyzer.cs
@@ -804,7 +804,9 @@ public virtual ResultTypes Analyze(ToNumber exp)
         {
             ResultTypes.Undefined or
                 ResultTypes.AngleNumber or
-                ResultTypes.PowerNumber
+                ResultTypes.PowerNumber or
+                ResultTypes.TemperatureNumber or
+                ResultTypes.MassNumber
                 => ResultTypes.Number,
             _ => ResultTypes.AngleNumber.ThrowFor(result),
         };

diff --git a/xFunc.Maths/Expressions/Units/ToNumber.cs b/xFunc.Maths/Expressions/Units/ToNumber.cs
@@ -40,6 +40,8 @@ public override object Execute(ExpressionParameters? parameters)
         {
             AngleValue angleValue => angleValue.Angle,
             PowerValue powerValue => powerValue.Value,
+            TemperatureValue temperatureValue => temperatureValue.Value,
+            MassValue massValue => massValue.Value,
             _ => throw new ResultIsNotSupportedException(this, result),
         };
     }

diff --git a/xFunc.Tests/Analyzers/TypeAnalyzerTests/StandardTests.cs b/xFunc.Tests/Analyzers/TypeAnalyzerTests/StandardTests.cs
@@ -902,6 +902,18 @@ public void TestPowerToNumber()
         Test(new ToNumber(PowerValue.Watt(10).AsExpression()), ResultTypes.Number);
     }
 
+    [Fact]
+    public void TestTemperatureToNumber()
+    {
+        Test(new ToNumber(TemperatureValue.Celsius(10).AsExpression()), ResultTypes.Number);
+    }
+
+    [Fact]
+    public void TestMassToNumber()
+    {
+        Test(new ToNumber(MassValue.Gram(10).AsExpression()), ResultTypes.Number);
+    }
+
     [Fact]
     public void TestToNumberException()
     {

diff --git a/xFunc.Tests/Expressions/Units/ToNumberTest.cs b/xFunc.Tests/Expressions/Units/ToNumberTest.cs
@@ -25,6 +25,26 @@ public void ExecutePowerTest()
         Assert.Equal(expected, actual);
     }
 
+    [Fact]
+    public void ExecuteTemperatureTest()
+    {
+        var exp = new ToNumber(TemperatureValue.Celsius(10).AsExpression());
+        var actual = exp.Execute();
+        var expected = new NumberValue(10.0);
+
+        Assert.Equal(expected, actual);
+    }
+
+    [Fact]
+    public void ExecuteMassTest()
+    {
+        var exp = new ToNumber(MassValue.Gram(10).AsExpression());
+        var actual = exp.Execute();
+        var expected = new NumberValue(10.0);
+
+        Assert.Equal(expected, actual);
+    }
+
     [Fact]
     public void ExecuteBoolTest()
     {