diff --git a/include/tools/datetime.hxx b/include/tools/datetime.hxx index dd435e3994ba..2194711dc208 100644 --- a/include/tools/datetime.hxx +++ b/include/tools/datetime.hxx @@ -26,6 +26,11 @@ #include +namespace tools +{ +class Duration; +} + class SAL_WARN_UNUSED TOOLS_DLLPUBLIC DateTime : public Date, public tools::Time { public: @@ -83,6 +88,8 @@ public: void AddTime( double fTimeInDays ); DateTime& operator +=( const tools::Time& rTime ); DateTime& operator -=( const tools::Time& rTime ); + /** Duration can be negative, so adding it will subtract its value. */ + DateTime& operator +=( const tools::Duration& rDuration ); private: void NormalizeTimeRemainderAndApply( tools::Time& rTime ); public: @@ -97,6 +104,8 @@ public: TOOLS_DLLPUBLIC friend double operator -( const DateTime& rDateTime1, const DateTime& rDateTime2 ); TOOLS_DLLPUBLIC friend sal_Int64 operator -( const DateTime& rDateTime, const Date& rDate ) { return static_cast(rDateTime) - rDate; } + /** Duration can be negative, so adding it will subtract its value. */ + TOOLS_DLLPUBLIC friend DateTime operator +( const DateTime& rDateTime, const tools::Duration& rDuration ); DateTime& operator =( const DateTime& rDateTime ); DateTime& operator =( const css::util::DateTime& rUDateTime ); diff --git a/include/tools/duration.hxx b/include/tools/duration.hxx new file mode 100644 index 000000000000..83b9d12a77b3 --- /dev/null +++ b/include/tools/duration.hxx @@ -0,0 +1,72 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#pragma once + +#include + +class DateTime; + +namespace tools +{ +/** Duration in days and time. Can be negative in which case days is 0 and time + is negative or both days and time are negative. +*/ +class SAL_WARN_UNUSED TOOLS_DLLPUBLIC Duration +{ +public: + Duration() {} + + /** Assumes that DateTime are normalized and there are no Time out-of-range + field values. */ + Duration(const ::DateTime& rStart, const ::DateTime& rEnd); + + /** Time can be a limited duration as well. We don't cater for out-of-range + minutes and seconds values here though. */ + Duration(const Time& rStart, const Time& rEnd); + + /** Difference in days, like DateTime()-DateTime(). */ + explicit Duration(double fTimeInDays); + + bool IsNegative() const { return mnDays < 0 || maTime.GetTime() < 0; } + sal_Int32 GetDays() const { return mnDays; } + const Time& GetTime() const { return maTime; } + double GetInDays() const { return static_cast(GetDays()) + GetTime().GetTimeInDays(); } + + /** Whether a duration is set. */ + operator bool() const { return maTime.GetTime() != 0 || mnDays != 0; } + + /** Unary minus. */ + Duration operator-() const; + + /** Add a duration to this instance. */ + Duration& Add(const Duration& rDuration, bool& rbOverflow); + + /** Get multiple of duration. */ + Duration Mult(sal_Int32 nMult, bool& rbOverflow) const; + +private: + /** Internal days and Time values. */ + Duration(sal_Int32 nDays, sal_Int64 nTime); + + /** Prerequisite: mnDays is already correctly set and absolute value of + nanoseconds less than one day. */ + void ApplyTime(sal_Int64 nNS); + + /** Prerequisite: mnDays is already correctly set and Time hour values + are adjusted. */ + void SetTimeDiff(const Time& rStart, const Time& rEnd); + +private: + Time maTime = Time(0); + sal_Int32 mnDays = 0; +}; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk index 9cf6c671fcef..d27f8c3efa58 100644 --- a/tools/CppunitTest_tools_test.mk +++ b/tools/CppunitTest_tools_test.mk @@ -17,6 +17,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,tools_test, \ tools/qa/cppunit/test_bigint \ tools/qa/cppunit/test_date \ tools/qa/cppunit/test_time \ + tools/qa/cppunit/test_duration \ tools/qa/cppunit/test_fract \ tools/qa/cppunit/test_inetmime \ tools/qa/cppunit/test_json_writer \ diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index bccbf95a2a01..8269e6ae98bf 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,tl,\ $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/datetime/datetime \ tools/source/datetime/datetimeutils \ + tools/source/datetime/duration \ tools/source/datetime/systemdatetime \ tools/source/datetime/tdate \ tools/source/datetime/ttime \ diff --git a/tools/qa/cppunit/test_duration.cxx b/tools/qa/cppunit/test_duration.cxx new file mode 100644 index 000000000000..0f5a4e002219 --- /dev/null +++ b/tools/qa/cppunit/test_duration.cxx @@ -0,0 +1,278 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include +#include + +#include +#include + +namespace tools +{ +class DurationTest : public CppUnit::TestFixture +{ +public: + void testDuration(); + + CPPUNIT_TEST_SUITE(DurationTest); + CPPUNIT_TEST(testDuration); + CPPUNIT_TEST_SUITE_END(); +}; + +void DurationTest::testDuration() +{ + { + const Duration aD(Time(0), Time(12, 0, 0)); + CPPUNIT_ASSERT_EQUAL(0.5, aD.GetInDays()); + } + { + const Duration aD(Time(24, 0, 0), Time(12, 0, 0)); + CPPUNIT_ASSERT_EQUAL(-0.5, aD.GetInDays()); + } + { + const DateTime aS(Date(23, 11, 1999), Time(6, 0, 0)); + const DateTime aE(Date(24, 11, 1999), Time(18, 0, 0)); + const Duration aD(aS, aE); + CPPUNIT_ASSERT_EQUAL(1.5, aD.GetInDays()); + DateTime aDT1(aS); + const DateTime aDT2 = aDT1 + aD; + CPPUNIT_ASSERT_EQUAL(aE, aDT2); + aDT1 += aD; + CPPUNIT_ASSERT_EQUAL(aE, aDT1); + aDT1 += aD; + CPPUNIT_ASSERT_EQUAL(DateTime(Date(26, 11, 1999), Time(6, 0, 0)), aDT1); + } + { + const DateTime aS(Date(23, 11, 1999), Time(18, 0, 0)); + const DateTime aE(Date(24, 11, 1999), Time(6, 0, 0)); + const Duration aD(aS, aE); + CPPUNIT_ASSERT_EQUAL(0.5, aD.GetInDays()); + DateTime aDT1(aS); + const DateTime aDT2 = aDT1 + aD; + CPPUNIT_ASSERT_EQUAL(aE, aDT2); + aDT1 += aD; + CPPUNIT_ASSERT_EQUAL(aE, aDT1); + aDT1 += aD; + CPPUNIT_ASSERT_EQUAL(DateTime(Date(24, 11, 1999), Time(18, 0, 0)), aDT1); + } + { + const DateTime aS(Date(24, 11, 1999), Time(18, 0, 0)); + const DateTime aE(Date(23, 11, 1999), Time(6, 0, 0)); + const Duration aD(aS, aE); + CPPUNIT_ASSERT_EQUAL(-1.5, aD.GetInDays()); + DateTime aDT1(aS); + const DateTime aDT2 = aDT1 + aD; + CPPUNIT_ASSERT_EQUAL(aE, aDT2); + aDT1 += aD; + CPPUNIT_ASSERT_EQUAL(aE, aDT1); + aDT1 += aD; + CPPUNIT_ASSERT_EQUAL(DateTime(Date(21, 11, 1999), Time(18, 0, 0)), aDT1); + } + { + const DateTime aS(Date(24, 11, 1999), Time(6, 0, 0)); + const DateTime aE(Date(23, 11, 1999), Time(18, 0, 0)); + const Duration aD(aS, aE); + CPPUNIT_ASSERT_EQUAL(-0.5, aD.GetInDays()); + DateTime aDT1(aS); + const DateTime aDT2 = aDT1 + aD; + CPPUNIT_ASSERT_EQUAL(aE, aDT2); + aDT1 += aD; + CPPUNIT_ASSERT_EQUAL(aE, aDT1); + aDT1 += aD; + CPPUNIT_ASSERT_EQUAL(DateTime(Date(23, 11, 1999), Time(6, 0, 0)), aDT1); + } + { + const Duration aD(1.5); + CPPUNIT_ASSERT_EQUAL(1.5, aD.GetInDays()); + CPPUNIT_ASSERT_EQUAL(DateTime(Date(24, 11, 1999), Time(18, 0, 0)), + DateTime(Date(23, 11, 1999), Time(6, 0, 0)) + aD); + } + { + const Duration aD(-1.5); + CPPUNIT_ASSERT_EQUAL(-1.5, aD.GetInDays()); + CPPUNIT_ASSERT_EQUAL(DateTime(Date(23, 11, 1999), Time(6, 0, 0)), + DateTime(Date(24, 11, 1999), Time(18, 0, 0)) + aD); + } + { + const Duration aD(-1.5); + const Duration aN = -aD; + CPPUNIT_ASSERT_EQUAL(1.5, aN.GetInDays()); + } + { // Add() + const DateTime aS(Date(23, 11, 1999), Time(0, 0, 0)); + const DateTime aE(Date(23, 11, 1999), Time(1, 23, 45)); + const Duration aD(aS, aE); + Duration aV = aD; + bool bOverflow = true; + aV.Add(aD, bOverflow); + CPPUNIT_ASSERT(!bOverflow); + CPPUNIT_ASSERT_EQUAL(DateTime(Date(23, 11, 1999), Time(2, 47, 30)), + DateTime(Date(23, 11, 1999), Time(0, 0, 0)) + aV); + for (int i = 0; i < 20; ++i) + aV.Add(aD, bOverflow); + CPPUNIT_ASSERT(!bOverflow); + CPPUNIT_ASSERT_EQUAL(DateTime(Date(24, 11, 1999), Time(6, 42, 30)), + DateTime(Date(23, 11, 1999), Time(0, 0, 0)) + aV); + CPPUNIT_ASSERT_EQUAL(static_cast(1), aV.GetDays()); + CPPUNIT_ASSERT_EQUAL(static_cast(6), aV.GetTime().GetHour()); + CPPUNIT_ASSERT_EQUAL(static_cast(42), aV.GetTime().GetMin()); + CPPUNIT_ASSERT_EQUAL(static_cast(30), aV.GetTime().GetSec()); + CPPUNIT_ASSERT(aV.GetTime().GetTime() > 0); + CPPUNIT_ASSERT_DOUBLES_EQUAL(1.27951388888889, aV.GetInDays(), 1E-14); + // Negative duration. + const Duration aN(aE, aS); + aV = aN; + aV.Add(aN, bOverflow); + CPPUNIT_ASSERT(!bOverflow); + CPPUNIT_ASSERT_EQUAL(DateTime(Date(22, 11, 1999), Time(21, 12, 30)), + DateTime(Date(23, 11, 1999), Time(0, 0, 0)) + aV); + for (int i = 0; i < 20; ++i) + aV.Add(aN, bOverflow); + CPPUNIT_ASSERT(!bOverflow); + CPPUNIT_ASSERT_EQUAL(DateTime(Date(21, 11, 1999), Time(17, 17, 30)), + DateTime(Date(23, 11, 1999), Time(0, 0, 0)) + aV); + CPPUNIT_ASSERT_EQUAL(static_cast(-1), aV.GetDays()); + CPPUNIT_ASSERT_EQUAL(static_cast(6), aV.GetTime().GetHour()); + CPPUNIT_ASSERT_EQUAL(static_cast(42), aV.GetTime().GetMin()); + CPPUNIT_ASSERT_EQUAL(static_cast(30), aV.GetTime().GetSec()); + CPPUNIT_ASSERT(aV.GetTime().GetTime() < 0); + CPPUNIT_ASSERT_DOUBLES_EQUAL(-1.27951388888889, aV.GetInDays(), 1E-14); + } + { // Mult() + const DateTime aS(Date(23, 11, 1999), Time(0, 0, 0)); + const DateTime aE(Date(23, 11, 1999), Time(1, 23, 45)); + const Duration aD(aS, aE); + bool bOverflow = true; + Duration aV = aD.Mult(22, bOverflow); + CPPUNIT_ASSERT(!bOverflow); + CPPUNIT_ASSERT_EQUAL(DateTime(Date(24, 11, 1999), Time(6, 42, 30)), + DateTime(Date(23, 11, 1999), Time(0, 0, 0)) + aV); + CPPUNIT_ASSERT_EQUAL(static_cast(1), aV.GetDays()); + CPPUNIT_ASSERT_EQUAL(static_cast(6), aV.GetTime().GetHour()); + CPPUNIT_ASSERT_EQUAL(static_cast(42), aV.GetTime().GetMin()); + CPPUNIT_ASSERT_EQUAL(static_cast(30), aV.GetTime().GetSec()); + CPPUNIT_ASSERT(aV.GetTime().GetTime() > 0); + CPPUNIT_ASSERT_DOUBLES_EQUAL(1.27951388888889, aV.GetInDays(), 1E-14); + // Negative duration. + const Duration aN(aE, aS); + bOverflow = true; + aV = aN.Mult(22, bOverflow); + CPPUNIT_ASSERT(!bOverflow); + CPPUNIT_ASSERT_EQUAL(DateTime(Date(21, 11, 1999), Time(17, 17, 30)), + DateTime(Date(23, 11, 1999), Time(0, 0, 0)) + aV); + CPPUNIT_ASSERT_EQUAL(static_cast(-1), aV.GetDays()); + CPPUNIT_ASSERT_EQUAL(static_cast(6), aV.GetTime().GetHour()); + CPPUNIT_ASSERT_EQUAL(static_cast(42), aV.GetTime().GetMin()); + CPPUNIT_ASSERT_EQUAL(static_cast(30), aV.GetTime().GetSec()); + CPPUNIT_ASSERT(aV.GetTime().GetTime() < 0); + CPPUNIT_ASSERT_DOUBLES_EQUAL(-1.27951388888889, aV.GetInDays(), 1E-14); + } + { // Mult() including days. + const Duration aD(1.5); + bool bOverflow = true; + Duration aV = aD.Mult(10, bOverflow); + CPPUNIT_ASSERT(!bOverflow); + CPPUNIT_ASSERT_DOUBLES_EQUAL(15.0, aV.GetInDays(), 0.0); + } + { // Mult() including days. + const Duration aD(-1.5); + bool bOverflow = true; + Duration aV = aD.Mult(10, bOverflow); + CPPUNIT_ASSERT(!bOverflow); + CPPUNIT_ASSERT_DOUBLES_EQUAL(-15.0, aV.GetInDays(), 0.0); + } + { // Mult() including days. + const Duration aD(1.5); + bool bOverflow = true; + Duration aV = aD.Mult(-10, bOverflow); + CPPUNIT_ASSERT(!bOverflow); + CPPUNIT_ASSERT_DOUBLES_EQUAL(-15.0, aV.GetInDays(), 0.0); + } + { // Mult() including days. + const Duration aD(-1.5); + bool bOverflow = true; + Duration aV = aD.Mult(-10, bOverflow); + CPPUNIT_ASSERT(!bOverflow); + CPPUNIT_ASSERT_DOUBLES_EQUAL(15.0, aV.GetInDays(), 0.0); + } + { // Mult() with overflow. + const Duration aD(SAL_MAX_INT32); + bool bOverflow = false; + Duration aV = aD.Mult(2, bOverflow); + CPPUNIT_ASSERT(bOverflow); + CPPUNIT_ASSERT_EQUAL(SAL_MAX_INT32, aV.GetDays()); + CPPUNIT_ASSERT_EQUAL(static_cast(23), aV.GetTime().GetHour()); + CPPUNIT_ASSERT_EQUAL(static_cast(59), aV.GetTime().GetMin()); + CPPUNIT_ASSERT_EQUAL(static_cast(59), aV.GetTime().GetSec()); + CPPUNIT_ASSERT_EQUAL(static_cast(Time::nanoSecPerSec - 1), + aV.GetTime().GetNanoSec()); + } + { // Mult() with overflow. + const Duration aD(SAL_MIN_INT32); + bool bOverflow = false; + Duration aV = aD.Mult(2, bOverflow); + CPPUNIT_ASSERT(bOverflow); + CPPUNIT_ASSERT_EQUAL(SAL_MIN_INT32, aV.GetDays()); + CPPUNIT_ASSERT_EQUAL(static_cast(23), aV.GetTime().GetHour()); + CPPUNIT_ASSERT_EQUAL(static_cast(59), aV.GetTime().GetMin()); + CPPUNIT_ASSERT_EQUAL(static_cast(59), aV.GetTime().GetSec()); + CPPUNIT_ASSERT_EQUAL(static_cast(Time::nanoSecPerSec - 1), + aV.GetTime().GetNanoSec()); + } + { // Mult() with overflow. + const Duration aD(SAL_MAX_INT32); + bool bOverflow = false; + Duration aV = aD.Mult(-2, bOverflow); + CPPUNIT_ASSERT(bOverflow); + CPPUNIT_ASSERT_EQUAL(SAL_MIN_INT32, aV.GetDays()); + CPPUNIT_ASSERT_EQUAL(static_cast(23), aV.GetTime().GetHour()); + CPPUNIT_ASSERT_EQUAL(static_cast(59), aV.GetTime().GetMin()); + CPPUNIT_ASSERT_EQUAL(static_cast(59), aV.GetTime().GetSec()); + CPPUNIT_ASSERT_EQUAL(static_cast(Time::nanoSecPerSec - 1), + aV.GetTime().GetNanoSec()); + } + { // Mult() with overflow. + const Duration aD(SAL_MIN_INT32); + bool bOverflow = false; + Duration aV = aD.Mult(-2, bOverflow); + CPPUNIT_ASSERT(bOverflow); + CPPUNIT_ASSERT_EQUAL(SAL_MAX_INT32, aV.GetDays()); + CPPUNIT_ASSERT_EQUAL(static_cast(23), aV.GetTime().GetHour()); + CPPUNIT_ASSERT_EQUAL(static_cast(59), aV.GetTime().GetMin()); + CPPUNIT_ASSERT_EQUAL(static_cast(59), aV.GetTime().GetSec()); + CPPUNIT_ASSERT_EQUAL(static_cast(Time::nanoSecPerSec - 1), + aV.GetTime().GetNanoSec()); + } + { // Inaccurate double yielding exact duration. + const Time aS(15, 0, 0); + const Time aE(16, 0, 0); + const Duration aD(aE.GetTimeInDays() - aS.GetTimeInDays()); + CPPUNIT_ASSERT_EQUAL(static_cast(0), aD.GetDays()); + CPPUNIT_ASSERT_EQUAL(static_cast(1), aD.GetTime().GetHour()); + CPPUNIT_ASSERT_EQUAL(static_cast(0), aD.GetTime().GetMin()); + CPPUNIT_ASSERT_EQUAL(static_cast(0), aD.GetTime().GetSec()); + CPPUNIT_ASSERT_EQUAL(static_cast(0), aD.GetTime().GetNanoSec()); + } + { // Inaccurate double yielding exact duration, negative. + const Time aS(15, 0, 0); + const Time aE(16, 0, 0); + const Duration aD(aS.GetTimeInDays() - aE.GetTimeInDays()); + CPPUNIT_ASSERT(aD.IsNegative()); + CPPUNIT_ASSERT_EQUAL(static_cast(0), aD.GetDays()); + CPPUNIT_ASSERT_EQUAL(static_cast(1), aD.GetTime().GetHour()); + CPPUNIT_ASSERT_EQUAL(static_cast(0), aD.GetTime().GetMin()); + CPPUNIT_ASSERT_EQUAL(static_cast(0), aD.GetTime().GetSec()); + CPPUNIT_ASSERT_EQUAL(static_cast(0), aD.GetTime().GetNanoSec()); + } +} + +CPPUNIT_TEST_SUITE_REGISTRATION(DurationTest); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/tools/source/datetime/datetime.cxx b/tools/source/datetime/datetime.cxx index 47dc0555bc87..ec2c53673b17 100644 --- a/tools/source/datetime/datetime.cxx +++ b/tools/source/datetime/datetime.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include +#include #include #include @@ -136,6 +137,13 @@ DateTime& DateTime::operator -=( const tools::Time& rTime ) return *this; } +DateTime& DateTime::operator +=( const tools::Duration& rDuration ) +{ + AddDays(rDuration.GetDays()); + operator+=(rDuration.GetTime()); + return *this; +} + DateTime operator +( const DateTime& rDateTime, sal_Int32 nDays ) { DateTime aDateTime( rDateTime ); @@ -164,27 +172,19 @@ DateTime operator -( const DateTime& rDateTime, const tools::Time& rTime ) return aDateTime; } +DateTime operator +( const DateTime& rDateTime, const tools::Duration& rDuration ) +{ + DateTime aDateTime(rDateTime); + aDateTime.AddDays( rDuration.GetDays()); + aDateTime += rDuration.GetTime(); + return aDateTime; +} + void DateTime::AddTime( double fTimeInDays ) { - double fInt, fFrac; - if ( fTimeInDays < 0.0 ) - { - fInt = ::rtl::math::approxCeil( fTimeInDays ); - fFrac = fInt <= fTimeInDays ? 0.0 : fTimeInDays - fInt; - } - else - { - fInt = ::rtl::math::approxFloor( fTimeInDays ); - fFrac = fInt >= fTimeInDays ? 0.0 : fTimeInDays - fInt; - } - AddDays( sal_Int32(fInt) ); // full days - if ( fFrac ) - { - tools::Time aTime(0); // default ctor calls system time, we don't need that - fFrac *= ::tools::Time::nanoSecPerDay; // time expressed in nanoseconds - aTime.MakeTimeFromNS( static_cast(fFrac) ); // method handles negative ns - operator+=( aTime ); - } + // Use Duration to diminish floating point accuracy errors. + tools::Duration aDuration(fTimeInDays); + operator+=(aDuration); } DateTime operator +( const DateTime& rDateTime, double fTimeInDays ) diff --git a/tools/source/datetime/duration.cxx b/tools/source/datetime/duration.cxx new file mode 100644 index 000000000000..07f79929177f --- /dev/null +++ b/tools/source/datetime/duration.cxx @@ -0,0 +1,256 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include +#include +#include +#include +#include + +namespace tools +{ +Duration::Duration(const ::DateTime& rStart, const ::DateTime& rEnd) + : mnDays(static_cast(rEnd) - static_cast(rStart)) +{ + SetTimeDiff(rStart, rEnd); +} + +Duration::Duration(const Time& rStart, const Time& rEnd) +{ + const sal_uInt16 nStartHour = rStart.GetHour(); + const sal_uInt16 nEndHour = rEnd.GetHour(); + if (nStartHour >= 24 || nEndHour >= 24) + { + Time aEnd(rEnd); + if (nEndHour >= 24) + { + mnDays = (nEndHour / 24) * (aEnd.GetTime() < 0 ? -1 : 1); + aEnd.SetHour(nEndHour % 24); + } + Time aStart(rStart); + if (nStartHour >= 24) + { + mnDays -= (nStartHour / 24) * (aStart.GetTime() < 0 ? -1 : 1); + aStart.SetHour(nStartHour % 24); + } + SetTimeDiff(aStart, aEnd); + } + else + { + SetTimeDiff(rStart, rEnd); + } +} + +Duration::Duration(double fTimeInDays) +{ + double fInt, fFrac; + if (fTimeInDays < 0.0) + { + fInt = ::rtl::math::approxCeil(fTimeInDays); + fFrac = fInt <= fTimeInDays ? 0.0 : fTimeInDays - fInt; + } + else + { + fInt = ::rtl::math::approxFloor(fTimeInDays); + fFrac = fInt >= fTimeInDays ? 0.0 : fTimeInDays - fInt; + } + mnDays = static_cast(fInt); + if (fFrac) + { + fFrac *= Time::nanoSecPerDay; + fFrac = ::rtl::math::approxFloor(fFrac); + sal_Int64 nNS = static_cast(fFrac); + // Round by 1 nanosecond if it's just 1 off to a second, i.e. + // 0999999999 or 0000000001. This could be losened to rounding by 2 or + // such if necessary. + const sal_Int64 nN = nNS % Time::nanoSecPerSec; + if (std::abs(nN) == 1) + nNS -= (nNS < 0) ? -1 : 1; + else if (std::abs(nN) == Time::nanoSecPerSec - 1) + { + nNS += (nNS < 0) ? -1 : 1; + if (std::abs(nNS) >= Time::nanoSecPerDay) + { + mnDays += nNS / Time::nanoSecPerDay; + nNS %= Time::nanoSecPerDay; + } + } + maTime.MakeTimeFromNS(nNS); + assert(mnDays == 0 || maTime.GetTime() == 0 || (mnDays < 0) == (nNS < 0)); + } +} + +Duration::Duration(sal_Int32 nDays, sal_Int64 nTime) + : maTime(nTime) + , mnDays(nDays) +{ +} + +void Duration::ApplyTime(sal_Int64 nNS) +{ + if (mnDays > 0 && nNS < 0) + { + --mnDays; + nNS = Time::nanoSecPerDay + nNS; + } + else if (mnDays < 0 && nNS > 0) + { + ++mnDays; + nNS = -Time::nanoSecPerDay + nNS; + } + maTime.MakeTimeFromNS(nNS); + assert(mnDays == 0 || maTime.GetTime() == 0 || (mnDays < 0) == (nNS < 0)); +} + +void Duration::SetTimeDiff(const Time& rStart, const Time& rEnd) +{ + const sal_Int64 nNS = rEnd.GetNSFromTime() - rStart.GetNSFromTime(); + ApplyTime(nNS); +} + +Duration Duration::operator-() const +{ + Duration aD(-mnDays, -maTime.GetTime()); + return aD; +} + +Duration& Duration::Add(const Duration& rDuration, bool& rbOverflow) +{ + rbOverflow = o3tl::checked_add(mnDays, rDuration.mnDays, mnDays); + // Duration is always normalized, time values >= 24h don't occur. + sal_Int64 nNS = maTime.GetNSFromTime() + rDuration.maTime.GetNSFromTime(); + if (nNS < -Time::nanoSecPerDay) + { + rbOverflow |= o3tl::checked_sub(mnDays, sal_Int32(1), mnDays); + nNS += Time::nanoSecPerDay; + } + else if (nNS > Time::nanoSecPerDay) + { + rbOverflow |= o3tl::checked_add(mnDays, sal_Int32(1), mnDays); + nNS -= Time::nanoSecPerDay; + } + ApplyTime(nNS); + return *this; +} + +Duration Duration::Mult(sal_Int32 nMult, bool& rbOverflow) const +{ + // First try a simple calculation in nanoseconds. + bool bBadNS = false; + sal_Int64 nNS; + sal_Int64 nDays; + if (o3tl::checked_multiply(static_cast(mnDays), static_cast(nMult), nDays) + || o3tl::checked_multiply(nDays, Time::nanoSecPerDay, nDays) + || o3tl::checked_multiply(maTime.GetNSFromTime(), static_cast(nMult), nNS) + || o3tl::checked_add(nDays, nNS, nNS)) + { + bBadNS = rbOverflow = true; + } + else + { + const sal_Int64 nD = nNS / Time::nanoSecPerDay; + if (nD < SAL_MIN_INT32 || SAL_MAX_INT32 < nD) + rbOverflow = true; + else + { + rbOverflow = false; + nNS -= nD * Time::nanoSecPerDay; + Duration aD(static_cast(nD), 0); + aD.ApplyTime(nNS); + return aD; + } + } + if (bBadNS) + { + // Simple calculation in overall nanoseconds overflew, try with + // individual components. + const sal_uInt64 nMult64 = (nMult < 0) ? -nMult : nMult; + do + { + rbOverflow = true; + sal_uInt64 nN; + if (o3tl::checked_multiply(static_cast(maTime.GetNanoSec()), nMult64, nN)) + break; + sal_uInt64 nS; + if (o3tl::checked_multiply(static_cast(maTime.GetSec()), nMult64, nS)) + break; + sal_uInt64 nM; + if (o3tl::checked_multiply(static_cast(maTime.GetMin()), nMult64, nM)) + break; + sal_uInt64 nH; + if (o3tl::checked_multiply(static_cast(maTime.GetHour()), nMult64, nH)) + break; + sal_uInt64 nD; + if (o3tl::checked_multiply(static_cast(mnDays < 0 ? -mnDays : mnDays), + nMult64, nD)) + break; + if (nN > Time::nanoSecPerSec) + { + const sal_uInt64 nC = nN / Time::nanoSecPerSec; + if (o3tl::checked_add(nS, nC, nS)) + break; + nN -= nC * Time::nanoSecPerSec; + } + if (nS > Time::secondPerMinute) + { + const sal_uInt64 nC = nS / Time::secondPerMinute; + if (o3tl::checked_add(nM, nC, nM)) + break; + nS -= nC * Time::secondPerMinute; + } + if (nM > Time::minutePerHour) + { + const sal_uInt64 nC = nM / Time::minutePerHour; + if (o3tl::checked_add(nH, nC, nH)) + break; + nM -= nC * Time::minutePerHour; + } + if (nH > Time::hourPerDay) + { + const sal_uInt64 nC = nH / Time::hourPerDay; + if (o3tl::checked_add(nD, nC, nD)) + break; + nH -= nC * Time::hourPerDay; + } + if (IsNegative() ? (static_cast(SAL_MAX_INT32) + 1) < nD + || -static_cast(nD) < SAL_MIN_INT32 + : SAL_MAX_INT32 < nD) + break; + + rbOverflow = false; + Time aTime(nH, nM, nS, nN); + if (IsNegative() == (nMult < 0)) + { + Duration aD(nD, aTime.GetTime()); + return aD; + } + else + { + Duration aD(-static_cast(nD), -aTime.GetTime()); + return aD; + } + } while (false); + } + assert(rbOverflow); + if (IsNegative() == (nMult < 0)) + { + Duration aD(SAL_MAX_INT32, 0); + aD.ApplyTime(Time::nanoSecPerDay - 1); + return aD; + } + else + { + Duration aD(SAL_MIN_INT32, 0); + aD.ApplyTime(-(Time::nanoSecPerDay - 1)); + return aD; + } +} +}; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */