Merge pull request #64 from WildernessLabs/feature/time-period

Feature/time period
WildernessLabs · Jun 26, 2024 · aca9224 · aca9224
2 parents b42147e + c18f6ef
commit aca9224
Show file tree

Hide file tree

Showing 6 changed files with 430 additions and 108 deletions.
diff --git a/Source/Meadow.Units.Tests/AngleTests.cs b/Source/Meadow.Units.Tests/AngleTests.cs
@@ -20,22 +20,22 @@ public void ConstructorTests()
             }
         }
 
-		[Fact]
-		public void ZeroCrossTests()
-		{
-			var a1 = new Angle(270);
-			var a2 = a1 + new Angle(180);
-			Assert.Equal(90d, a2.Degrees);
-
-			var a3 = new Angle(90);
-			var a4 = a3 - new Angle(180);
-			Assert.Equal(270d, a4.Degrees);
-
-			var a5 = a3 * 5;
-			Assert.Equal(90d, a5.Degrees);
-		}
-
-		[Fact]
+        [Fact]
+        public void ZeroCrossTests()
+        {
+            var a1 = new Angle(270);
+            var a2 = a1 + new Angle(180);
+            Assert.Equal(90d, a2.Degrees);
+
+            var a3 = new Angle(90);
+            var a4 = a3 - new Angle(180);
+            Assert.Equal(270d, a4.Degrees);
+
+            var a5 = a3 * 5;
+            Assert.Equal(90d, a5.Degrees);
+        }
+
+        [Fact]
         public void MultiplicationTests()
         {
             var initial = _random.NextDouble() * 360;
@@ -56,5 +56,21 @@ public void DivisionTests()
             a /= operand;
             Assert.Equal(initial / operand, a.Degrees);
         }
+
+        [Fact]
+        public void LtGtTests()
+        {
+            var minusTen = new Angle(-10);
+            var zero = Angle.Zero;
+            var plusTen = new Angle(10);
+
+            Assert.True(minusTen < zero);
+            Assert.True(minusTen < plusTen);
+            Assert.True(zero < plusTen);
+
+            Assert.True(zero > minusTen);
+            Assert.True(plusTen > zero);
+            Assert.True(plusTen > minusTen);
+        }
     }
 }
diff --git a/Source/Meadow.Units.Tests/LengthTests.cs b/Source/Meadow.Units.Tests/LengthTests.cs
@@ -1,98 +1,95 @@
 using Xunit;
-using System;
-using Meadow.Units;
 using LU = Meadow.Units.Length.UnitType;
 
-namespace Meadow.Units.Tests
+namespace Meadow.Units.Tests;
+
+public class LengthTests
 {
-    public class LengthTests
+    [Fact()]
+    public void LengthCtors()
+    {
+        Length t = new Length(10, LU.Meters);
+        Assert.True(t.Meters == 10);
+
+        Length t2 = new Length(40);
+        Assert.True(t2.Meters == 40);
+    }
+
+    [Fact()]
+    public void LengthConversions()
+    {
+        Length t = new Length(10, LU.Meters);
+        Assert.True(t.Kilometers == 0.01);
+        Assert.True(t.Centimeters == 1000);
+        Assert.True(t.Decimeters == 100);
+        Assert.True(t.Millimeters == 10000);
+        Assert.True(t.Microns == 10000000);
+        Assert.True(t.Nanometers == 10000000000);
+        Assert.True(t.Miles.Equals4DigitPrecision(0.00621371));
+        Assert.True(t.NauticalMiles.Equals4DigitPrecision(0.00539957));
+        Assert.True(t.Yards.Equals4DigitPrecision(10.9361));
+        Assert.True(t.Feet.Equals4DigitPrecision(32.8084));
+    }
+
+    [Fact()]
+    public void LengthMathOps()
     {
-        [Fact()]
-        public void LengthCtors()
-        {
-            Length t = new Length(10, LU.Meters);
-            Assert.True(t.Meters == 10);
-
-            Length t2 = new Length(40);
-            Assert.True(t2.Meters == 40);
-        }
-
-        [Fact()]
-        public void LengthConversions()
-        {
-            Length t = new Length(10, LU.Meters);
-            Assert.True(t.Kilometers == 0.01);
-            Assert.True(t.Centimeters == 1000);
-            Assert.True(t.Decimeters == 100);
-            Assert.True(t.Millimeters == 10000);
-            Assert.True(t.Microns == 10000000);
-            Assert.True(t.Nanometers == 10000000000);
-            Assert.True(t.Miles.Equals4DigitPrecision(0.00621371));
-            Assert.True(t.NauticalMiles.Equals4DigitPrecision(0.00539957));
-            Assert.True(t.Yards.Equals4DigitPrecision(10.9361));
-            Assert.True(t.Feet.Equals4DigitPrecision(32.8084));
-        }
-
-        [Fact()]
-        public void LengthMathOps()
-        {
-            Length t1 = new Length(1);
-            Length t2 = new Length(10);
-            Length t3 = new Length(-3);
-            Assert.True(t1 != t2);
-            Assert.True((t1 + t2) == new Length(11));
-            Assert.True((t2 - t1) == new Length(9));
-
-            Assert.True(t3.Abs() == new Length(3));
-        }
-
-        [Fact()]
-        public void LengthComparisons()
-        {
-            Length t1 = new Length(1);
-            Length t2 = new Length(10);
-            Length t3 = new Length(10);
-
-            Assert.True(t1 < t2);
-            Assert.True(t2 <= t3);
-            Assert.True(t2 > t1);
-            Assert.True(t3 >= t2);
-
-            Assert.True(t2 == t3);
-
-            Assert.True(t2 == new Length(10, LU.Meters));
-            Assert.True(t2 > new Length(5, LU.Meters));
-
-            Assert.True(t2.CompareTo(t3) == 0);
-            Assert.True(t2.CompareTo(t1) > 0);
-            Assert.True(t1.CompareTo(t2) < 0);
-
-            Assert.True(t2.Equals(t3));
-            Assert.True(!t2.Equals(t1));
-        }
-
-        [Fact()]
-        public void RandomTests()
-        {
-            // assignment
-            Length i1 = new Length(100, LU.Meters);
-            i1 = new Length(25);
-            Assert.True(i1 == new Length(25));
-
-            // more assignment
-            Length i2 = i1;
-            Assert.True(i2 == new Length(25, LU.Meters));
-
-            Length i3 = new Length(i2);
-            Assert.True(i3 == i2);
-        }
-
-        //[Fact()]
-        //public void LengthTypeConversions()
-        //{
-        //    Length t1 = new Length(50, LU.Meters);
-
-        //    Assert.True(t1.ToInt32(FormatProi) == 50);
-        //}
+        Length t1 = new Length(1);
+        Length t2 = new Length(10);
+        Length t3 = new Length(-3);
+        Assert.True(t1 != t2);
+        Assert.True((t1 + t2) == new Length(11));
+        Assert.True((t2 - t1) == new Length(9));
+
+        Assert.True(t3.Abs() == new Length(3));
     }
+
+    [Fact()]
+    public void LengthComparisons()
+    {
+        Length t1 = new Length(1);
+        Length t2 = new Length(10);
+        Length t3 = new Length(10);
+
+        Assert.True(t1 < t2);
+        Assert.True(t2 <= t3);
+        Assert.True(t2 > t1);
+        Assert.True(t3 >= t2);
+
+        Assert.True(t2 == t3);
+
+        Assert.True(t2 == new Length(10, LU.Meters));
+        Assert.True(t2 > new Length(5, LU.Meters));
+
+        Assert.True(t2.CompareTo(t3) == 0);
+        Assert.True(t2.CompareTo(t1) > 0);
+        Assert.True(t1.CompareTo(t2) < 0);
+
+        Assert.True(t2.Equals(t3));
+        Assert.True(!t2.Equals(t1));
+    }
+
+    [Fact()]
+    public void RandomTests()
+    {
+        // assignment
+        Length i1 = new Length(100, LU.Meters);
+        i1 = new Length(25);
+        Assert.True(i1 == new Length(25));
+
+        // more assignment
+        Length i2 = i1;
+        Assert.True(i2 == new Length(25, LU.Meters));
+
+        Length i3 = new Length(i2);
+        Assert.True(i3 == i2);
+    }
+
+    //[Fact()]
+    //public void LengthTypeConversions()
+    //{
+    //    Length t1 = new Length(50, LU.Meters);
+
+    //    Assert.True(t1.ToInt32(FormatProi) == 50);
+    //}
 }
diff --git a/Source/Meadow.Units.Tests/TimePeriodTests.cs b/Source/Meadow.Units.Tests/TimePeriodTests.cs
@@ -0,0 +1,16 @@
+using Xunit;
+
+namespace Meadow.Units.Tests
+{
+    public class TimePeriodTests
+    {
+        [Fact()]
+        public void MicroSecondsCreationTests()
+        {
+            var p = TimePeriod.FromMicroseconds(1);
+            Assert.Equal(0.000001d, p.Seconds);
+            Assert.Equal(0.001d, p.Milliseconds);
+            Assert.Equal(1000, p.Nanoseconds);
+        }
+    }
+}
diff --git a/Source/Meadow.Units/Conversions/TimePeriodConversions.cs b/Source/Meadow.Units/Conversions/TimePeriodConversions.cs
@@ -0,0 +1,25 @@
+namespace Meadow.Units.Conversions;
+
+internal static class TimePeriodConversions
+{
+    public static double Convert(double value, TimePeriod.UnitType from, TimePeriod.UnitType to)
+    {
+        if (from == to)
+        {
+            return value;
+        }
+        return value * timeConversions[(int)to] / timeConversions[(int)from];
+    }
+
+    //must align to enum
+    private static readonly double[] timeConversions =
+    {
+        1_000_000_000,//ns
+        1_000_000,//us
+        1_000,//ms
+        1,//s
+        1/60d, //min
+        1/(60d * 60d), //hrs
+        1/(60d * 60d *24d), //days
+    };
+}
diff --git a/Source/Meadow.Units/Meadow.Units.csproj b/Source/Meadow.Units/Meadow.Units.csproj
@@ -19,7 +19,7 @@
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>10.0</LangVersion>
-    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+      <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <None Include="icon.png" Pack="true" PackagePath="" />