|
|
Boost-Commit : |
From: arseny.kapoulkine_at_[hidden]
Date: 2007-08-19 14:22:28
Author: zeux
Date: 2007-08-19 14:22:27 EDT (Sun, 19 Aug 2007)
New Revision: 38764
URL: http://svn.boost.org/trac/boost/changeset/38764
Log:
Const-correctness fixes, == 0 and != 0 fixes (damn safe boolean casts), division fix, improved behavior for from/to string conversion, improved multiplication (selecting between FFT and basecase), bitshifts speedup for exact counts, eliminated gcc warning in FFT multiplicator
Text files modified:
sandbox/SOC/2007/bigint/boost/bigint/bigint.hpp | 78 +++++++++++++++++++++++----------------
sandbox/SOC/2007/bigint/boost/bigint/bigint_default.hpp | 69 +++++++++++++++++++++++++---------
sandbox/SOC/2007/bigint/boost/bigint/bigint_fft_multiplicator.hpp | 2
sandbox/SOC/2007/bigint/boost/bigint/bigint_gmp.hpp | 6 +-
4 files changed, 100 insertions(+), 55 deletions(-)
Modified: sandbox/SOC/2007/bigint/boost/bigint/bigint.hpp
==============================================================================
--- sandbox/SOC/2007/bigint/boost/bigint/bigint.hpp (original)
+++ sandbox/SOC/2007/bigint/boost/bigint/bigint.hpp 2007-08-19 14:22:27 EDT (Sun, 19 Aug 2007)
@@ -138,7 +138,7 @@
return *this;
}
- bigint_base operator++(int)
+ bigint_base operator++(int) const
{
bigint_base old = *this;
impl.inc();
@@ -151,7 +151,7 @@
return *this;
}
- bigint_base operator--(int)
+ bigint_base operator--(int) const
{
bigint_base old = *this;
impl.dec();
@@ -256,6 +256,50 @@
return impl.template to_number<T>();
}
+ bool operator<(const bigint_base& rhs) const
+ {
+ return impl.compare(rhs.impl) < 0;
+ }
+
+ bool operator<=(const bigint_base& rhs) const
+ {
+ return impl.compare(rhs.impl) <= 0;
+ }
+
+ bool operator>(const bigint_base& rhs) const
+ {
+ return impl.compare(rhs.impl) > 0;
+ }
+
+ bool operator>=(const bigint_base& rhs) const
+ {
+ return impl.compare(rhs.impl) >= 0;
+ }
+
+ bool operator==(const bigint_base& rhs) const
+ {
+ return impl.compare(rhs.impl) == 0;
+ }
+
+ // workaround for bigint == 0 (safe bool conversion :-/)
+ bool operator==(int rhs) const
+ {
+ bigint_base n = rhs;
+ return *this == n;
+ }
+
+ bool operator!=(const bigint_base& rhs) const
+ {
+ return impl.compare(rhs.impl) != 0;
+ }
+
+ // workaround for bigint != 0 (safe bool conversion :-/)
+ bool operator!=(int rhs) const
+ {
+ bigint_base n = rhs;
+ return *this != n;
+ }
+
// - basic arithmetic operations (addition, subtraction, multiplication, division)
friend bigint_base operator+(const bigint_base& lhs, const bigint_base& rhs)
{
@@ -330,36 +374,6 @@
return result;
}
- friend bool operator<(const bigint_base& lhs, const bigint_base& rhs)
- {
- return lhs.impl.compare(rhs.impl) < 0;
- }
-
- friend bool operator<=(const bigint_base& lhs, const bigint_base& rhs)
- {
- return lhs.impl.compare(rhs.impl) <= 0;
- }
-
- friend bool operator>(const bigint_base& lhs, const bigint_base& rhs)
- {
- return lhs.impl.compare(rhs.impl) > 0;
- }
-
- friend bool operator>=(const bigint_base& lhs, const bigint_base& rhs)
- {
- return lhs.impl.compare(rhs.impl) >= 0;
- }
-
- friend bool operator==(const bigint_base& lhs, const bigint_base& rhs)
- {
- return lhs.impl.compare(rhs.impl) == 0;
- }
-
- friend bool operator!=(const bigint_base& lhs, const bigint_base& rhs)
- {
- return lhs.impl.compare(rhs.impl) != 0;
- }
-
friend bigint_base abs(const bigint_base& value)
{
bigint_base result;
Modified: sandbox/SOC/2007/bigint/boost/bigint/bigint_default.hpp
==============================================================================
--- sandbox/SOC/2007/bigint/boost/bigint/bigint_default.hpp (original)
+++ sandbox/SOC/2007/bigint/boost/bigint/bigint_default.hpp 2007-08-19 14:22:27 EDT (Sun, 19 Aug 2007)
@@ -106,7 +106,7 @@
template <typename Ch> void _assign_str(const Ch* str, int base)
{
- assert(base >= 2 && base <= 36);
+ if (base < 2 && base > 36) return assign(0);
// skip whitespace
while (detail::bigint::isspace(*str)) ++str;
@@ -253,7 +253,7 @@
size_t ri_size = rhs.data.size();
data.resize((std::max)(lhs.data.size(), rhs.data.size()));
-
+
const limb_t* li = lhs.data.begin();
const limb_t* li_end = li + li_size;
const limb_t* ri = rhs.data.begin();
@@ -428,9 +428,41 @@
assign(0);
return;
}
-
- // _mul_unsigned_basecase(lhs, rhs);
- _mul_unsigned_fft(lhs, rhs);
+
+ // Some research revealed that:
+
+ // 1. For limb counts below 512, basecase is always faster
+ if (lhs.data.size() <= 512 || rhs.data.size() <= 512)
+ _mul_unsigned_basecase(lhs, rhs);
+ else
+ {
+ // if cost of 1x1 multiply is 1
+ uint64_t basecase_cost = static_cast<uint64_t>(lhs.data.size()) * rhs.data.size();
+ // ... the cost of 1 step of FFT (if the asymptotical performance is N*logN) is about 32
+
+ // find FFT (uint16) size
+ size_t max_size = (std::max)(lhs.data.size(), rhs.data.size());
+
+ // round up to the nearest power of two
+ size_t N = 1;
+ while (N < max_size) N *= 2;
+
+ // fix N depending on limb_type
+ N = N * sizeof(limb_t) / sizeof(uint16_t);
+ if (N == 0) N = 1;
+
+ // destination size
+ N *= 2;
+
+ size_t logN = bigint_fft_multiplicator<limb_bit_number>::log2(N);
+
+ uint64_t fft_cost = static_cast<uint64_t>(N) * logN * 32;
+
+ if (basecase_cost < fft_cost)
+ _mul_unsigned_basecase(lhs, rhs);
+ else
+ _mul_unsigned_fft(lhs, rhs);
+ }
negative = lhs.negative ? !rhs.negative : rhs.negative;
}
@@ -466,7 +498,7 @@
y.negative = false;
// without this our estimates for qd become very bad
- limb_t d = static_cast<limb_t>((static_cast<limb2_t>(limb_max()) + 1) / (static_cast<limb_t>(y.data[y.data.size() - 1]) + 1));
+ limb_t d = static_cast<limb_t>((static_cast<limb2_t>(limb_max()) + 1) / (static_cast<limb2_t>(y.data.back()) + 1));
x._mul_add(d, 0);
y._mul_add(d, 0);
@@ -524,31 +556,30 @@
/ y.data.back()
);
- bigint_default_implementation rs = y;
- rs._mul_add(qd, 0);
- rs.sub(xx, rs);
+ r = y;
+ r._mul_add(qd, 0);
+ r.sub(xx, r);
- // rs = xx - qd * y
+ // r = xx - qd * y
- if (!rs.negative)
+ if (!r.negative)
{
- while (rs.compare(y) >= 0)
+ while (r.compare(y) >= 0)
{
++qd;
- rs.sub(rs, y);
+ r.sub(r, y);
}
}
else
{
- while (rs.negative)
+ while (r.negative)
{
--qd;
- rs.add(rs, y);
+ r.add(r, y);
}
}
*p = static_cast<limb_t>(qd);
- r = rs;
}
}
while (i != x.data.begin());
@@ -770,7 +801,7 @@
for (const limb_t* li = lhs.data.begin(); li != lhs.data.end(); ++li)
*di++ = *li;
- _mul_add(1 << (rhs % limb_bit_number), 0);
+ if (rhs % limb_bit_number != 0) _mul_add(1 << (rhs % limb_bit_number), 0);
negative = lhs.negative;
}
@@ -802,7 +833,7 @@
for (const limb_t* li = lhs.data.begin() + rhs / limb_bit_number; li != lhs.data.end(); ++li)
*di++ = *li;
- limb_t r = _div_rem(1 << (rhs % limb_bit_number));
+ limb_t r = (rhs % limb_bit_number != 0 ? _div_rem(1 << (rhs % limb_bit_number)) : 0);
if (lhs.negative)
{
@@ -912,7 +943,7 @@
template <typename Ch> std::basic_string<Ch> _to_str(int base) const
{
- assert(base >= 2 && base <= 36);
+ if (base < 2 || base > 36) return std::basic_string<Ch>(1, Ch('0'));
if (data.empty()) return std::basic_string<Ch>(1, Ch('0'));
Modified: sandbox/SOC/2007/bigint/boost/bigint/bigint_fft_multiplicator.hpp
==============================================================================
--- sandbox/SOC/2007/bigint/boost/bigint/bigint_fft_multiplicator.hpp (original)
+++ sandbox/SOC/2007/bigint/boost/bigint/bigint_fft_multiplicator.hpp 2007-08-19 14:22:27 EDT (Sun, 19 Aug 2007)
@@ -33,7 +33,7 @@
return static_cast<uint32_t>(static_cast<uint64_t>(a) * b % prime);
#else
int r = a * b - prime * static_cast<uint32_t>(inv_prime * static_cast<int>(a) * b);
- r = (r < 0 ? r + prime : r > prime ? r - prime : r);
+ r = (r < 0 ? r + prime : r > static_cast<int>(prime) ? r - prime : r);
BOOST_ASSERT(static_cast<uint32_t>(r) == static_cast<uint32_t>(static_cast<uint64_t>(a) * b % prime));
return r;
#endif
Modified: sandbox/SOC/2007/bigint/boost/bigint/bigint_gmp.hpp
==============================================================================
--- sandbox/SOC/2007/bigint/boost/bigint/bigint_gmp.hpp (original)
+++ sandbox/SOC/2007/bigint/boost/bigint/bigint_gmp.hpp 2007-08-19 14:22:27 EDT (Sun, 19 Aug 2007)
@@ -94,7 +94,7 @@
template <typename Ch> void _assign_str(const Ch* str, int base)
{
- assert(base >= 2 && base <= 36);
+ if (base < 2 && base > 36) return assign(0);
// skip whitespace
while (detail::bigint::isspace(*str)) ++str;
@@ -281,7 +281,7 @@
std::string str(int base) const
{
- assert(base >= 2 && base <= 36);
+ if (base < 2 || base > 36) return std::string(1, '0');
size_t s_size = mpz_sizeinbase(data, base) + (mpz_sgn(data) < 0);
scoped_array<char> s(new char[s_size + 1]);
@@ -293,7 +293,7 @@
std::wstring wstr(int base) const
{
- assert(base >= 2 && base <= 36);
+ if (base < 2 || base > 36) return std::wstring(1, wchar_t('0'));
size_t s_size = mpz_sizeinbase(data, base) + (mpz_sgn(data) < 0);
scoped_array<char> s(new char[s_size + 1]);
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk