From 0f618198b54dfa3bfdf890e9c045f15867e26319 Mon Sep 17 00:00:00 2001 From: Drew Tingen Date: Mon, 9 Sep 2019 15:06:39 -0400 Subject: [PATCH] fix: Rename "Mod" to "Modulus" to keep S+ from throwing a fit --- ICD.Common.Utils/DateTimeUtils.cs | 2 +- ICD.Common.Utils/Extensions/TimeSpanExtensions.cs | 8 ++++---- ICD.Common.Utils/MathUtils.cs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ICD.Common.Utils/DateTimeUtils.cs b/ICD.Common.Utils/DateTimeUtils.cs index a424ffd..06efee2 100644 --- a/ICD.Common.Utils/DateTimeUtils.cs +++ b/ICD.Common.Utils/DateTimeUtils.cs @@ -9,7 +9,7 @@ /// public static int To12Hour(int hour) { - return MathUtils.Mod(hour + 11, 12) + 1; + return MathUtils.Modulus(hour + 11, 12) + 1; } } } diff --git a/ICD.Common.Utils/Extensions/TimeSpanExtensions.cs b/ICD.Common.Utils/Extensions/TimeSpanExtensions.cs index 6cb9e00..d0acfe5 100644 --- a/ICD.Common.Utils/Extensions/TimeSpanExtensions.cs +++ b/ICD.Common.Utils/Extensions/TimeSpanExtensions.cs @@ -34,7 +34,7 @@ namespace ICD.Common.Utils.Extensions /// public static TimeSpan AddHoursAndWrap(this TimeSpan extends, int hours) { - hours = MathUtils.Mod(hours + extends.Hours, 24); + hours = MathUtils.Modulus(hours + extends.Hours, 24); return new TimeSpan(extends.Days, hours, extends.Minutes, extends.Seconds, extends.Milliseconds); } @@ -49,8 +49,8 @@ namespace ICD.Common.Utils.Extensions int currentHour = extends.Hours; bool am = extends.Hours < 12; - int current12Hour = MathUtils.Mod(currentHour, 12); - int new12Hour = MathUtils.Mod(current12Hour + hours, 12); + int current12Hour = MathUtils.Modulus(currentHour, 12); + int new12Hour = MathUtils.Modulus(current12Hour + hours, 12); return am ? new TimeSpan(extends.Days, new12Hour, extends.Minutes, extends.Seconds, extends.Milliseconds) @@ -65,7 +65,7 @@ namespace ICD.Common.Utils.Extensions /// public static TimeSpan AddMinutesAndWrap(this TimeSpan extends, int minutes) { - minutes = MathUtils.Mod(minutes + extends.Minutes, 60); + minutes = MathUtils.Modulus(minutes + extends.Minutes, 60); return new TimeSpan(extends.Days, extends.Hours, minutes, extends.Seconds, extends.Milliseconds); } } diff --git a/ICD.Common.Utils/MathUtils.cs b/ICD.Common.Utils/MathUtils.cs index ee6ebe5..e40f116 100644 --- a/ICD.Common.Utils/MathUtils.cs +++ b/ICD.Common.Utils/MathUtils.cs @@ -216,7 +216,7 @@ namespace ICD.Common.Utils /// /// /// - public static int Mod(int number, int mod) + public static int Modulus(int number, int mod) { int remainder = number % mod; return remainder < 0 ? remainder + mod : remainder;