V10.1.0/api improvements and features

Cuemon.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31919.166
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11217.181 d18.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B59C8DF7-7DEC-46AF-A165-CC9E3AD01EA8}"
 EndProject
@@ -170,6 +170,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cuemon.AspNetCore.Mvc.Funct
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cuemon.AspNetCore.FunctionalTests", "test\Cuemon.AspNetCore.FunctionalTests\Cuemon.AspNetCore.FunctionalTests.csproj", "{0618AFB5-D95A-48F9-A07A-B3A2DB876FC0}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tooling", "tooling", "{11659885-1727-4DC8-809A-8FFCC6F53966}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cuemon.Core.Benchmarks", "tooling\Cuemon.Core.Benchmarks\Cuemon.Core.Benchmarks.csproj", "{6BC4C5DC-CECC-4E6C-8B95-673670A40BF8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -492,6 +496,10 @@ Global
 		{0618AFB5-D95A-48F9-A07A-B3A2DB876FC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0618AFB5-D95A-48F9-A07A-B3A2DB876FC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0618AFB5-D95A-48F9-A07A-B3A2DB876FC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6BC4C5DC-CECC-4E6C-8B95-673670A40BF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BC4C5DC-CECC-4E6C-8B95-673670A40BF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BC4C5DC-CECC-4E6C-8B95-673670A40BF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6BC4C5DC-CECC-4E6C-8B95-673670A40BF8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -576,6 +584,7 @@ Global
 		{AE0ADF91-E7C7-4CB4-A39D-E1A5374C5602} = {B59C8DF7-7DEC-46AF-A165-CC9E3AD01EA8}
 		{28AC63CA-9E57-4C36-81B4-C03DD0CFC0EA} = {31707D2B-843E-4D4F-B9C7-3E74EF8DA338}
 		{0618AFB5-D95A-48F9-A07A-B3A2DB876FC0} = {31707D2B-843E-4D4F-B9C7-3E74EF8DA338}
+		{6BC4C5DC-CECC-4E6C-8B95-673670A40BF8} = {11659885-1727-4DC8-809A-8FFCC6F53966}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2A848386-B682-4F6D-8254-B5F6247C3054}

Directory.Build.props

@@ -1,6 +1,9 @@
 <Project>
   <PropertyGroup>
     <IsTestProject>$(MSBuildProjectName.EndsWith('Tests'))</IsTestProject>
+    <IsBenchmarkProject>$(MSBuildProjectName.EndsWith('Benchmarks'))</IsBenchmarkProject>
+    <IsSourceProject>$(MSBuildProjectDirectory.ToLower().StartsWith('$(MSBuildThisFileDirectory.ToLower())src'))</IsSourceProject>
+    <IsToolingProject>$(MSBuildProjectDirectory.ToLower().StartsWith('$(MSBuildThisFileDirectory.ToLower())tooling'))</IsToolingProject>
     <IsLinux>$([MSBuild]::IsOSPlatform('Linux'))</IsLinux>
     <IsWindows>$([MSBuild]::IsOSPlatform('Windows'))</IsWindows>
     <IsMainAuthor Condition="'$(EMAIL)' == '[email protected]'">true</IsMainAuthor>
@@ -13,7 +16,7 @@
     <Deterministic>true</Deterministic>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(IsTestProject)' == 'false'">
+  <PropertyGroup Condition="'$(IsSourceProject)' == 'true'">
     <TargetFrameworks>net10.0;net9.0;netstandard2.0</TargetFrameworks>
     <Copyright>Copyright © Geekle 2009-2025. All rights reserved.</Copyright>
     <Authors>gimlichael</Authors>
@@ -46,7 +49,7 @@
     <SourceRoot Include="$(NuGetPackageRoot)" RepositoryUrl="https://github.com/codebeltnet/cuemon" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(IsTestProject)' == 'false'">
+  <ItemGroup Condition="'$(IsSourceProject)' == 'true'">
     <PackageReference Include="MinVer" PrivateAssets="all" />
     <None Include="..\..\.nuget\icon.png" Pack="true" Visible="false" PackagePath="icon.png" />
     <None Include="..\..\.nuget\$(MSBuildProjectName)\README.md" Pack="true" PackagePath="\" />
@@ -67,14 +70,23 @@
     <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
     <RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis>
     <SonarQubeExclude>true</SonarQubeExclude>
-    <WarningLevel>0</WarningLevel>
     <AnalysisLevel>none</AnalysisLevel>
     <NoWarn>NU1701,NU1902,NU1903</NoWarn>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <NuGetAudit>false</NuGetAudit>
     <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(IsTestProject)' == 'true' AND '$(BuildingInsideVisualStudio)' != 'true'">
+    <WarningLevel>0</WarningLevel>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(IsToolingProject)' == 'true'">
+    <IsPackable>false</IsPackable>
+    <OutputType>Exe</OutputType>
+    <SonarQubeExclude>true</SonarQubeExclude>
+  </PropertyGroup>
+
   <ItemGroup Condition="'$(IsTestProject)' == 'true'">
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit.v3" />
@@ -97,4 +109,13 @@
     <PackageReference Include="Codebelt.Extensions.Xunit" />
   </ItemGroup>
 
+  <PropertyGroup Condition="'$(IsBenchmarkProject)' == 'true'">
+    <TargetFrameworks>net10.0;net9.0;netstandard2.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(IsBenchmarkProject)' == 'true'">
+    <PackageReference Include="BenchmarkDotNet" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" />
+  </ItemGroup>
+
 </Project>

Directory.Packages.props

@@ -4,6 +4,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="AutoFixture" Version="4.18.1" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.15.6" />
+    <PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.15.6" />
     <PackageVersion Include="Codebelt.Extensions.Xunit" Version="11.0.1" />
     <PackageVersion Include="Codebelt.Extensions.Xunit.Hosting" Version="11.0.1" />
     <PackageVersion Include="Codebelt.Extensions.Xunit.Hosting.AspNetCore" Version="11.0.1" />

src/Cuemon.Core/DateSpan.cs

@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Linq;
 using Cuemon.Collections.Generic;
+using Cuemon.Security;
 
 namespace Cuemon
 {
@@ -13,6 +14,9 @@ namespace Cuemon
         private readonly DateTime _lower;
         private readonly DateTime _upper;
         private readonly Calendar _calendar;
+        private readonly ulong _calendarId;
+        private static readonly ulong Hash = (ulong)new FowlerNollVo64().OffsetBasis;
+        private static readonly ulong Prime = (ulong)new FowlerNollVo64().Prime;
 
         /// <summary>
 		/// Initializes a new instance of the <see cref="DateSpan"/> structure with a default <see cref="DateTime"/> value set to <see cref="DateTime.Today"/>.
@@ -23,7 +27,7 @@ public DateSpan(DateTime start) : this(start, DateTime.Today)
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="DateSpan"/> structure with a default <see cref="_calendar"/> value from the <see cref="CultureInfo.InvariantCulture"/> class.
+        /// Initializes a new instance of the <see cref="DateSpan"/> structure with a default <see cref="Calendar"/> value from the <see cref="CultureInfo.InvariantCulture"/> class.
         /// </summary>
         /// <param name="start">A <see cref="DateTime"/> value for the <see cref="DateSpan"/> calculation.</param>
         /// <param name="end">A <see cref="DateTime"/> value for the <see cref="DateSpan"/> calculation.</param>
@@ -45,69 +49,34 @@ public DateSpan(DateTime start, DateTime end, Calendar calendar) : this()
             _upper = Arguments.ToEnumerableOf(start, end).Max();
             _calendar = calendar;
 
+            _calendarId = _calendar switch
+            {
+                ChineseLunisolarCalendar => 1,
+                JapaneseLunisolarCalendar => 2,
+                KoreanLunisolarCalendar => 3,
+                TaiwanLunisolarCalendar => 4,
+                EastAsianLunisolarCalendar => 5,
+                GregorianCalendar => 6,
+                HebrewCalendar => 7,
+                HijriCalendar => 8,
+                JapaneseCalendar => 9,
+                JulianCalendar => 10,
+                KoreanCalendar => 11,
+                PersianCalendar => 12,
+                TaiwanCalendar => 13,
+                ThaiBuddhistCalendar => 14,
+                UmAlQuraCalendar => 15,
+                _ => (ulong)_calendar.GetType().FullName!.GetHashCode()
+            };
+
             var lower = _lower;
             var upper = _upper;
 
-            var months = 0;
-            var days = 0;
-
             var years = GetYears(upper, lower, out var adjustYearsMinusOne);
-            var hours = 0;
-            var milliseconds = 0;
-
-            int daysPerYears = 0;
-            var y = lower.Year;
-            do
-            {
-                daysPerYears += _calendar.GetDaysInYear(y);
-                y++;
-            } while (y < upper.Year);
-
-            var daysPerYearsAverage = years == 0 ? daysPerYears : Convert.ToDouble(daysPerYears) / Convert.ToDouble(years);
 
-            while (!lower.Year.Equals(upper.Year) || !lower.Month.Equals(upper.Month))
-            {
-                var daysPerMonth = _calendar.GetDaysInMonth(lower.Year, lower.Month);
-                var peekNextLower = lower.AddMonths(1);
-                if (peekNextLower > upper)
-                {
-                    while (!lower.Month.Equals(upper.Month) || !lower.Day.Equals(upper.Day))
-                    {
-                        days++;
-                        lower = lower.AddDays(1);
-                    }
-
-                    if (lower > upper)
-                    {
-                        lower = lower.AddDays(-1);
-                        days--;
-
-                        while (!lower.Hour.Equals(upper.Hour))
-                        {
-                            hours++;
-                            lower = lower.AddHours(1);
-                        }
-
-                        while (!lower.Minute.Equals(upper.Minute) || !lower.Second.Equals(upper.Second) || !lower.Millisecond.Equals(upper.Millisecond))
-                        {
-                            milliseconds++;
-                            lower = lower.AddMilliseconds(1);
-                        }
-                    }
-                }
-                else
-                {
-                    days += daysPerMonth;
-                    lower = lower.AddMonths(1);
-                    months++;
-                }
-            }
+            var daysPerYearsAverage = CalculateAverageDaysPerYear(lower, upper, years);
 
-            while (!lower.Day.Equals(upper.Day))
-            {
-                days++;
-                lower = lower.AddDays(1);
-            }
+            CalculateDifference(ref lower, upper, out var months, out var days, out var hours, out var milliseconds);
 
             var averageDaysPerMonth = months == 0 ? days : Convert.ToDouble(days) / Convert.ToDouble(months);
             var remainder = new TimeSpan(days, hours, 0, 0, milliseconds);
@@ -149,21 +118,98 @@ private static int GetYears(DateTime upper, DateTime lower, out bool adjustYears
             return years;
         }
 
+        private double CalculateAverageDaysPerYear(DateTime lower, DateTime upper, int years)
+        {
+            var daysPerYears = 0;
+            var y = lower.Year;
+            do
+            {
+                daysPerYears += _calendar.GetDaysInYear(y);
+                y++;
+            } while (y < upper.Year);
+
+            return years == 0 ? daysPerYears : Convert.ToDouble(daysPerYears) / Convert.ToDouble(years);
+        }
+
+        private void CalculateDifference(ref DateTime lower, DateTime upper, out int months, out int days, out int hours, out int milliseconds)
+        {
+            months = 0;
+            days = 0;
+            hours = 0;
+            milliseconds = 0;
+
+            while (!lower.Year.Equals(upper.Year) || !lower.Month.Equals(upper.Month))
+            {
+                var daysPerMonth = _calendar.GetDaysInMonth(lower.Year, lower.Month);
+                var peekNextLower = lower.AddMonths(1);
+                if (peekNextLower > upper)
+                {
+                    CalculatePartialMonthDifference(ref lower, upper, ref days, ref hours, ref milliseconds);
+                }
+                else
+                {
+                    days += daysPerMonth;
+                    lower = lower.AddMonths(1);
+                    months++;
+                }
+            }
+
+            while (!lower.Day.Equals(upper.Day))
+            {
+                days++;
+                lower = lower.AddDays(1);
+            }
+        }
+
+        private static void CalculatePartialMonthDifference(ref DateTime lower, DateTime upper, ref int days, ref int hours, ref int milliseconds)
+        {
+            while (!lower.Month.Equals(upper.Month) || !lower.Day.Equals(upper.Day))
+            {
+                days++;
+                lower = lower.AddDays(1);
+            }
+
+            if (lower > upper)
+            {
+                lower = lower.AddDays(-1);
+                days--;
+
+                CalculateTimeDifference(ref lower, upper, ref hours, ref milliseconds);
+            }
+        }
+
+        private static void CalculateTimeDifference(ref DateTime lower, DateTime upper, ref int hours, ref int milliseconds)
+        {
+            while (!lower.Hour.Equals(upper.Hour))
+            {
+                hours++;
+                lower = lower.AddHours(1);
+            }
+
+            while (!lower.Minute.Equals(upper.Minute) || !lower.Second.Equals(upper.Second) || !lower.Millisecond.Equals(upper.Millisecond))
+            {
+                milliseconds++;
+                lower = lower.AddMilliseconds(1);
+            }
+        }
+
         /// <summary>
 		/// Calculates the number of weeks represented by the current <see cref="DateSpan"/> structure.
 		/// </summary>
 		/// <value>Calculates the number of weeks represented by the current <see cref="DateSpan"/> structure.</value>
 		public int GetWeeks()
         {
             var range = _upper.Subtract(_lower);
-            var totalDays = 0;
+            int totalDays;
             if (range.Days <= 7)
             {
                 totalDays = _lower.DayOfWeek > _upper.DayOfWeek ? 2 : 1;
             }
-            if (totalDays == 0) { totalDays = range.Days - 7 + (int)_lower.DayOfWeek; }
-            int nextWeek = 0, weeks;
-            for (weeks = 1; nextWeek < totalDays; weeks++) { nextWeek += 7; }
+            else
+            {
+                totalDays = range.Days - 7 + (int)_lower.DayOfWeek;
+            }
+            var weeks = 1 + ((totalDays + 6) / 7);
             return weeks;
         }
 
@@ -176,7 +222,22 @@ public int GetWeeks()
         /// </returns>
         public override int GetHashCode()
         {
-            return Generate.HashCode32(_upper, _lower, _calendar.GetType().FullName);
+            unchecked
+            {
+                var hash = Hash;
+                var prime = Prime;
+
+                hash ^= (ulong)_upper.Ticks;
+                hash *= prime;
+
+                hash ^= (ulong)_lower.Ticks;
+                hash *= prime;
+
+                hash ^= _calendarId;
+                hash *= prime;
+
+                return (int)(hash ^ (hash >> 32));
+            }
         }
 
         /// <summary>
@@ -199,7 +260,7 @@ public override bool Equals(object obj)
         /// <returns><c>true</c> if the current object is equal to the other parameter; otherwise, <c>false</c>. </returns>
         public bool Equals(DateSpan other)
         {
-            if ((_upper != other._upper) || (_calendar != other._calendar)) { return false; }
+            if ((_upper != other._upper) || (_calendarId != other._calendarId)) { return false; }
             return (_lower == other._lower);
         }
 
@@ -251,7 +312,7 @@ public static DateSpan Parse(string start, string end)
         /// </summary>
         /// <param name="start">A string that specifies the starting date and time value for the <see cref="DateSpan"/> interval.</param>
         /// <param name="end">A string that specifies the ending date and time value for the <see cref="DateSpan"/> interval.</param>
-        /// <param name="culture">A <see cref="CultureInfo"/> to resolve a <see cref="_calendar"/> object from.</param>
+        /// <param name="culture">A <see cref="CultureInfo"/> to resolve a <see cref="Calendar"/> object from.</param>
         /// <returns>A <see cref="DateSpan"/> that corresponds to <paramref name="start"/> and <paramref name="end"/> of the interval.</returns>
         public static DateSpan Parse(string start, string end, CultureInfo culture)
         {
@@ -360,4 +421,4 @@ public override string ToString()
         /// <value>The total number of years represented by the current <see cref="DateSpan"/> structure.</value>
         public double TotalYears { get; }
     }
-}
+}