From 5a7427f95c6d0eed506b384090bb26858ea4ec14 Mon Sep 17 00:00:00 2001 From: Marco De Salvo Date: Mon, 20 Jan 2025 14:54:15 +0100 Subject: [PATCH] Renamed internal methods --- .../TIME/Abstractions/TIMEConverter.cs | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/OWLSharp/Extensions/TIME/Abstractions/TIMEConverter.cs b/OWLSharp/Extensions/TIME/Abstractions/TIMEConverter.cs index 8c6e87ea..519c9768 100644 --- a/OWLSharp/Extensions/TIME/Abstractions/TIMEConverter.cs +++ b/OWLSharp/Extensions/TIME/Abstractions/TIMEConverter.cs @@ -79,9 +79,9 @@ public static TIMECoordinate CoordinateFromPosition(double timePosition, TIMEPos //Execute the clock emulator on the transformed time position if (scaledTimePositionSeconds > 0) - ClockForwardToCoordinate(scaledTimePositionSeconds, coordinate, calendarTRS); + TickForward(scaledTimePositionSeconds, coordinate, calendarTRS); else if (scaledTimePositionSeconds < 0) - ClockBackwardFromCoordinate(scaledTimePositionSeconds, coordinate, calendarTRS); + TickBackward(scaledTimePositionSeconds, coordinate, calendarTRS); } #endregion @@ -291,80 +291,80 @@ public static TIMEExtent ExtentBetweenCoordinates(TIMECoordinate timeCoordinateS #endregion #region Utilities - internal static void ClockForwardToCoordinate(double secondsToConsume, TIMECoordinate positionTRSOrigin, TIMECalendarReferenceSystem calendarTRS) + internal static void TickForward(double secondsToConsume, TIMECoordinate timeCoordinate, TIMECalendarReferenceSystem calendarTRS) { - uint[] metricsMonths = calendarTRS.Metrics.LeapYearRule?.Invoke(positionTRSOrigin.Year ?? 0) + uint[] metricsMonths = calendarTRS.Metrics.LeapYearRule?.Invoke(timeCoordinate.Year ?? 0) ?? calendarTRS.Metrics.Months; while (secondsToConsume >= calendarTRS.Metrics.SecondsInMinute) { secondsToConsume -= calendarTRS.Metrics.SecondsInMinute; - positionTRSOrigin.Minute++; - if (positionTRSOrigin.Minute < calendarTRS.Metrics.MinutesInHour) + timeCoordinate.Minute++; + if (timeCoordinate.Minute < calendarTRS.Metrics.MinutesInHour) continue; //Minute overflow => propagate to hour - positionTRSOrigin.Minute = 0; - positionTRSOrigin.Hour++; - if (positionTRSOrigin.Hour < calendarTRS.Metrics.HoursInDay) + timeCoordinate.Minute = 0; + timeCoordinate.Hour++; + if (timeCoordinate.Hour < calendarTRS.Metrics.HoursInDay) continue; //Hour overflow => propagate to day - positionTRSOrigin.Hour = 0; - positionTRSOrigin.Day++; - if (positionTRSOrigin.Day <= metricsMonths[Convert.ToInt32(positionTRSOrigin.Month)-1]) + timeCoordinate.Hour = 0; + timeCoordinate.Day++; + if (timeCoordinate.Day <= metricsMonths[Convert.ToInt32(timeCoordinate.Month)-1]) continue; //Day overflow => propagate to month - positionTRSOrigin.Day = 1; - positionTRSOrigin.Month++; - if (positionTRSOrigin.Month <= calendarTRS.Metrics.MonthsInYear) + timeCoordinate.Day = 1; + timeCoordinate.Month++; + if (timeCoordinate.Month <= calendarTRS.Metrics.MonthsInYear) continue; //Month overflow => propagate to year, fetch new metrics - positionTRSOrigin.Month = 1; - positionTRSOrigin.Year++; - metricsMonths = calendarTRS.Metrics.LeapYearRule?.Invoke(positionTRSOrigin.Year ?? 0) + timeCoordinate.Month = 1; + timeCoordinate.Year++; + metricsMonths = calendarTRS.Metrics.LeapYearRule?.Invoke(timeCoordinate.Year ?? 0) ?? calendarTRS.Metrics.Months; } - positionTRSOrigin.Second = Math.Truncate(positionTRSOrigin.Second.Value + secondsToConsume); + timeCoordinate.Second = Math.Truncate(timeCoordinate.Second.Value + secondsToConsume); } - internal static void ClockBackwardFromCoordinate(double secondsToConsume, TIMECoordinate positionTRSOrigin, TIMECalendarReferenceSystem calendarTRS) + internal static void TickBackward(double secondsToConsume, TIMECoordinate timeCoordinate, TIMECalendarReferenceSystem calendarTRS) { - uint[] metricsMonths = calendarTRS.Metrics.LeapYearRule?.Invoke(positionTRSOrigin.Year ?? 0) + uint[] metricsMonths = calendarTRS.Metrics.LeapYearRule?.Invoke(timeCoordinate.Year ?? 0) ?? calendarTRS.Metrics.Months; while (secondsToConsume < 0) { secondsToConsume += calendarTRS.Metrics.SecondsInMinute; - positionTRSOrigin.Minute--; - if (positionTRSOrigin.Minute >= 0) + timeCoordinate.Minute--; + if (timeCoordinate.Minute >= 0) continue; //Minute underflow => propagate to hour - positionTRSOrigin.Minute = calendarTRS.Metrics.MinutesInHour - 1; - positionTRSOrigin.Hour--; - if (positionTRSOrigin.Hour >= 0) + timeCoordinate.Minute = calendarTRS.Metrics.MinutesInHour - 1; + timeCoordinate.Hour--; + if (timeCoordinate.Hour >= 0) continue; //Hour underflow => propagate to day - positionTRSOrigin.Hour = calendarTRS.Metrics.HoursInDay - 1; - positionTRSOrigin.Day--; - if (positionTRSOrigin.Day >= 1) + timeCoordinate.Hour = calendarTRS.Metrics.HoursInDay - 1; + timeCoordinate.Day--; + if (timeCoordinate.Day >= 1) continue; //Day underflow => propagate to month - positionTRSOrigin.Month--; - if (positionTRSOrigin.Month == 0) + timeCoordinate.Month--; + if (timeCoordinate.Month == 0) { //Month underflow => propagate to year, fetch new metrics - positionTRSOrigin.Month = calendarTRS.Metrics.MonthsInYear; - positionTRSOrigin.Year--; - metricsMonths = calendarTRS.Metrics.LeapYearRule?.Invoke(positionTRSOrigin.Year ?? 0) + timeCoordinate.Month = calendarTRS.Metrics.MonthsInYear; + timeCoordinate.Year--; + metricsMonths = calendarTRS.Metrics.LeapYearRule?.Invoke(timeCoordinate.Year ?? 0) ?? calendarTRS.Metrics.Months; } - positionTRSOrigin.Day = metricsMonths[Convert.ToInt32(positionTRSOrigin.Month)-1]; + timeCoordinate.Day = metricsMonths[Convert.ToInt32(timeCoordinate.Month)-1]; } - positionTRSOrigin.Second = Math.Truncate(positionTRSOrigin.Second.Value + secondsToConsume); + timeCoordinate.Second = Math.Truncate(timeCoordinate.Second.Value + secondsToConsume); } #endregion }