diff options
author | Juan Picca <jumapico@gmail.com> | 2014-09-19 14:19:30 -0300 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2014-10-09 11:33:33 +0000 |
commit | 47a2d7642d249d70b5da0c330a73f3a0032e4bba (patch) | |
tree | 202b04810382ea87cf8015a7b4de29e931408948 /include/tools | |
parent | ae77dc81c33ab0817264bcf5fc8bb71a55b78a73 (diff) |
fdo#81356: convert Fraction to boost::rational<long> - wip
* Added rational util functions used by Fraction class not
available in the boost::rational class.
* Replaced usage of Fraction by boost::rational<long>
* Removed code that relies on:
1. fraction.IsValid() -- rational only allow valid values, ie
denominator() != 0
2. rational.denominator() == 0 -- always false
3. rational.denominator() < 0 -- always false but implementation
detail: http://www.boost.org/doc/libs/release/libs/rational/rational.html#Internal%20representation
* Simplified code that relies on:
1. rational.denominator() != 0 -- always true
* BUGS EXIST because Fraction allows the creation of invalid values but
boost::rational throws the exception boost::bad_rational
Change-Id: I84970a4956afb3f91ac0c8f726547466319420f9
Reviewed-on: https://gerrit.libreoffice.org/11551
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'include/tools')
-rw-r--r-- | include/tools/bigint.hxx | 4 | ||||
-rw-r--r-- | include/tools/fract.hxx | 142 | ||||
-rw-r--r-- | include/tools/rational.hxx | 25 |
3 files changed, 25 insertions, 146 deletions
diff --git a/include/tools/bigint.hxx b/include/tools/bigint.hxx index 33d19bc67c0c..c4c1c6d7b9fe 100644 --- a/include/tools/bigint.hxx +++ b/include/tools/bigint.hxx @@ -28,8 +28,6 @@ class SvStream; #define MAX_DIGITS 8 -class Fraction; - class TOOLS_DLLPUBLIC SAL_WARN_UNUSED BigInt { private: @@ -144,8 +142,6 @@ public: TOOLS_DLLPUBLIC friend bool operator> ( const BigInt& rVal1, const BigInt& rVal2 ); friend inline bool operator<=( const BigInt& rVal1, const BigInt& rVal2 ); friend inline bool operator>=( const BigInt& rVal1, const BigInt& rVal2 ); - - friend class Fraction; }; inline BigInt::operator short() const diff --git a/include/tools/fract.hxx b/include/tools/fract.hxx deleted file mode 100644 index 10e810ecb4ca..000000000000 --- a/include/tools/fract.hxx +++ /dev/null @@ -1,142 +0,0 @@ -/* -*- 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_TOOLS_FRACT_HXX -#define INCLUDED_TOOLS_FRACT_HXX - -#include <tools/toolsdllapi.h> - -class SvStream; - -class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Fraction -{ -private: - long nNumerator; - long nDenominator; - -public: - Fraction() { nNumerator = 0; nDenominator = 1; } - Fraction( const Fraction & rFrac ); - Fraction( long nNum, long nDen=1 ); - Fraction( double dVal ); - - bool IsValid() const; - - long GetNumerator() const { return nNumerator; } - long GetDenominator() const { return nDenominator; } - - operator long() const; - operator double() const; - - Fraction& operator=( const Fraction& rfrFrac ); - - Fraction& operator+=( const Fraction& rfrFrac ); - Fraction& operator-=( const Fraction& rfrFrac ); - Fraction& operator*=( const Fraction& rfrFrac ); - Fraction& operator/=( const Fraction& rfrFrac ); - - void ReduceInaccurate( unsigned nSignificantBits ); - - friend inline Fraction operator+( const Fraction& rVal1, const Fraction& rVal2 ); - friend inline Fraction operator-( const Fraction& rVal1, const Fraction& rVal2 ); - friend inline Fraction operator*( const Fraction& rVal1, const Fraction& rVal2 ); - friend inline Fraction operator/( const Fraction& rVal1, const Fraction& rVal2 ); - - TOOLS_DLLPUBLIC friend bool operator==( const Fraction& rVal1, const Fraction& rVal2 ); - friend inline bool operator!=( const Fraction& rVal1, const Fraction& rVal2 ); - TOOLS_DLLPUBLIC friend bool operator< ( const Fraction& rVal1, const Fraction& rVal2 ); - TOOLS_DLLPUBLIC friend bool operator> ( const Fraction& rVal1, const Fraction& rVal2 ); - friend inline bool operator<=( const Fraction& rVal1, const Fraction& rVal2 ); - friend inline bool operator>=( const Fraction& rVal1, const Fraction& rVal2 ); - - TOOLS_DLLPUBLIC friend SvStream& ReadFraction( SvStream& rIStream, Fraction& rFract ); - TOOLS_DLLPUBLIC friend SvStream& WriteFraction( SvStream& rOStream, const Fraction& rFract ); -}; - -inline Fraction::Fraction( const Fraction& rFrac ) -{ - nNumerator = rFrac.nNumerator; - nDenominator = rFrac.nDenominator; -} - -inline Fraction& Fraction::operator=( const Fraction& rFrac ) -{ - nNumerator = rFrac.nNumerator; - nDenominator = rFrac.nDenominator; - return *this; -} - -inline bool Fraction::IsValid() const -{ - return (nDenominator > 0); -} - -inline Fraction::operator long() const -{ - if ( nDenominator > 0 ) - return (nNumerator / nDenominator); - else - return 0; -} - -inline Fraction operator+( const Fraction& rVal1, const Fraction& rVal2 ) -{ - Fraction aErg( rVal1 ); - aErg += rVal2; - return aErg; -} - -inline Fraction operator-( const Fraction& rVal1, const Fraction& rVal2 ) -{ - Fraction aErg( rVal1 ); - aErg -= rVal2; - return aErg; -} - -inline Fraction operator*( const Fraction& rVal1, const Fraction& rVal2 ) -{ - Fraction aErg( rVal1 ); - aErg *= rVal2; - return aErg; -} - -inline Fraction operator/( const Fraction& rVal1, const Fraction& rVal2 ) -{ - Fraction aErg( rVal1 ); - aErg /= rVal2; - return aErg; -} - -inline bool operator !=( const Fraction& rVal1, const Fraction& rVal2 ) -{ - return !(rVal1 == rVal2); -} - -inline bool operator <=( const Fraction& rVal1, const Fraction& rVal2 ) -{ - return !(rVal1 > rVal2); -} - -inline bool operator >=( const Fraction& rVal1, const Fraction& rVal2 ) -{ - return !(rVal1 < rVal2); -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/tools/rational.hxx b/include/tools/rational.hxx new file mode 100644 index 000000000000..0eeb1032a83c --- /dev/null +++ b/include/tools/rational.hxx @@ -0,0 +1,25 @@ +/* -*- 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/. + * + */ +#ifndef INCLUDED_TOOLS_RATIONAL_HXX +#define INCLUDED_TOOLS_RATIONAL_HXX + +#include <boost/rational.hpp> +#include <tools/toolsdllapi.h> + +class SvStream; + +TOOLS_DLLPUBLIC boost::rational<long> rational_FromDouble(double dVal); +TOOLS_DLLPUBLIC void rational_ReduceInaccurate(boost::rational<long>& rRational, unsigned nSignificantBits); +TOOLS_DLLPUBLIC SvStream& ReadFraction(SvStream& rIStream, boost::rational<long>& rRational); +TOOLS_DLLPUBLIC SvStream& WriteFraction(SvStream& rOStream, const boost::rational<long>& rRational); + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |