DateOnlyInterval

Author: csbernath

Foundation/.Net-5.0/Core/DateOnly.cs

@@ -7,10 +7,12 @@ namespace Foundation.Core
     /// <summary>
     /// https://github.com/dotnet/runtime/blob/main/src/libraries/System.Private.CoreLib/src/System/DateOnly.cs
     /// </summary>
-    public readonly struct DateOnly
+    [DebuggerDisplay("{DebuggerDisplay,nq}")]
+    public readonly struct DateOnly : IComparable<DateOnly>
     {
         private readonly int _dayNumber;
 
+        private const int MinDayNumber = 0;
         private const int MaxDayNumber = 3_652_058;
 
         private static int DayNumberFromDateTime(DateTime dt) => (int) (dt.Ticks / TimeSpan.TicksPerDay);
@@ -39,11 +41,36 @@ public DateOnly AddDays(int value)
             static void ThrowOutOfRange() => throw new ArgumentOutOfRangeException(nameof(value));
         }
 
+        [Pure]
+        public DateTime ToDateTime() => ToDateTime(_dayNumber);
+
+        [Pure]
+        private static DateTime ToDateTime(int dayNumber) => new DateTime(dayNumber * TimeSpan.TicksPerDay);
+        
         public static bool operator ==(DateOnly left, DateOnly right) => left._dayNumber == right._dayNumber;
         public static bool operator !=(DateOnly left, DateOnly right) => left._dayNumber != right._dayNumber;
         public static bool operator >(DateOnly left, DateOnly right) => left._dayNumber > right._dayNumber;
         public static bool operator >=(DateOnly left, DateOnly right) => left._dayNumber >= right._dayNumber;
         public static bool operator <(DateOnly left, DateOnly right) => left._dayNumber < right._dayNumber;
         public static bool operator <=(DateOnly left, DateOnly right) => left._dayNumber <= right._dayNumber;
+
+        public int CompareTo(DateOnly other) => _dayNumber.CompareTo(other._dayNumber);
+
+        internal string DebuggerDisplay
+        {
+            get
+            {
+                string debuggerDisplay;
+
+                if (_dayNumber == MinDayNumber)
+                    debuggerDisplay = $"{ToDateTime():d}(min)";
+                else if (_dayNumber == MaxDayNumber)
+                    debuggerDisplay = $"{ToDateTime():d}(max)";
+                else
+                    debuggerDisplay = $"{ToDateTime():d}";
+
+                return debuggerDisplay;
+            }
+        }
     }
 }

Foundation/.Net-5.0/Core/DateOnlyInterval.cs

@@ -1,4 +1,8 @@
-namespace Foundation.Core
+using System.Collections.Generic;
+using System.Diagnostics.Contracts;
+using Foundation.Assertions;
+
+namespace Foundation.Core
 {
     public readonly struct DateOnlyInterval
     {
@@ -7,8 +11,59 @@ public readonly struct DateOnlyInterval
 
         public DateOnlyInterval(DateOnly start, DateOnly end)
         {
+            Assert.IsTrue(start <= end);
             Start = start;
             End = end;
         }
+
+        [Pure]
+        public bool Contains(DateOnly date)
+        {
+            var contains = Start <= date && date <= End;
+            return contains;
+        }
+
+        [Pure]
+        public bool Contains(DateOnlyInterval other)
+        {
+            var contains = Start <= other.Start && other.End <= End;
+            return contains;
+        }
+
+        [Pure]
+        public DateOnlyInterval? Intersect(DateOnlyInterval other)
+        {
+            var start = ElementPair.Max(Start, other.Start);
+            var end = ElementPair.Min(End, other.End);
+            var intersects = start <= end;
+            return intersects
+                ? new DateOnlyInterval(start, end)
+                : (DateOnlyInterval?) null;
+        }
+
+        [Pure]
+        public bool Intersects(DateOnlyInterval other)
+        {
+            var start = ElementPair.Max(Start, other.Start);
+            var end = ElementPair.Min(End, other.End);
+            var intersects = start <= end;
+            return intersects;
+        }
+
+        //[Pure]
+        //public int GetLength()
+        //{
+        //    var length = End - Start + 1;
+        //    return length;
+        //}
+
+        [Pure]
+        public IEnumerable<DateOnly> GetDates()
+        {
+            for (var date = Start; date <= End; date = date.AddDays(1))
+                yield return date;
+        }
+
+        private string DebuggerDisplay => $"{Start.DebuggerDisplay}-{End.DebuggerDisplay}";
     }
 }

Foundation/.Net-5.0/Core/SmallDate.cs

@@ -32,7 +32,7 @@ public SmallDate(int year, int month, int day)
             _value = ToSmallDateValue(dateTime);
         }
 
-        public ushort Value => _value;
+        //public ushort Value => _value;
         public int Year => ToDateTime(_value).Year;
         public int Month => ToDateTime(_value).Month;
         public int Day => ToDateTime(_value).Day;

Foundation/.Net-5.0/Core/SmallDateInterval.cs

@@ -21,14 +21,14 @@ public SmallDateInterval(SmallDate start, SmallDate end)
         [Pure]
         public bool Contains(SmallDate date)
         {
-            var contains = Start.Value <= date.Value && date.Value <= End.Value;
+            var contains = Start <= date && date <= End;
             return contains;
         }
 
         [Pure]
         public bool Contains(SmallDateInterval other)
         {
-            var contains = Start.Value <= other.Start.Value && other.End.Value <= End.Value;
+            var contains = Start <= other.Start && other.End <= End;
             return contains;
         }