git.ucc.asn.au
/
ipdf
/
code.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compile with float/double again.
[ipdf/code.git]
/
src
/
arbint.h
diff --git
a/src/arbint.h
b/src/arbint.h
index
0f047c9
..
468785f
100644
(file)
--- a/
src/arbint.h
+++ b/
src/arbint.h
@@
-23,9
+23,9
@@
namespace IPDF
virtual ~Arbint() {}
Arbint(const Arbint & cpy);
virtual ~Arbint() {}
Arbint(const Arbint & cpy);
- int64_t AsDigit() const
+ int64_t AsDigit() const
{
{
- int64_t digit = (m_digits.size() == 1) ? m_digits[0] : 0x
7FFFFFFFFFFFFFFF
;
+ int64_t digit = (m_digits.size() == 1) ? m_digits[0] : 0x
BADF00D
;
return (m_sign) ? -digit : digit;
}
return (m_sign) ? -digit : digit;
}
@@
-60,6
+60,20
@@
namespace IPDF
a -= add;
return a;
}
a -= add;
return a;
}
+
+ inline Arbint operator-()
+ {
+ Arbint a(*this);
+ a.m_sign = !a.m_sign;
+ return a;
+ }
+
+ inline Arbint operator-() const
+ {
+ Arbint a(*this);
+ a.m_sign = !a.m_sign;
+ return a;
+ }
inline Arbint operator*(const Arbint & mul) const
{
inline Arbint operator*(const Arbint & mul) const
{
@@
-92,6
+106,7
@@
namespace IPDF
bool operator==(const Arbint & equ) const;
bool operator<(const Arbint & less) const;
bool operator==(const Arbint & equ) const;
bool operator<(const Arbint & less) const;
+
inline bool operator!=(const Arbint & equ) const
{
inline bool operator!=(const Arbint & equ) const
{
@@
-123,8
+138,18
@@
namespace IPDF
return result;
}
bool IsZero() const;
return result;
}
bool IsZero() const;
-
- //inline operator double() const {return double(AsDigit());}
+
+ inline operator double() const
+ {
+ double acc = 0;
+ for (int i = m_digits.size()-1; i >= 0; --i)
+ {
+ acc += (double)m_digits[i];
+ acc *= (double)UINT64_MAX + 1.0;
+ }
+ if (m_sign) acc *= -1;
+ return acc;
+ }
inline operator int64_t() const {return AsDigit();}
//inline operator int() const {return int(AsDigit());}
inline operator int64_t() const {return AsDigit();}
//inline operator int() const {return int(AsDigit());}
@@
-136,6
+161,8
@@
namespace IPDF
Arbint & AddBasic(const Arbint & add);
Arbint & SubBasic(const Arbint & sub);
Arbint & AddBasic(const Arbint & add);
Arbint & SubBasic(const Arbint & sub);
+ void GrowDigit(digit_t new_msd); // add a new most significant digit
+
bool GetBit(unsigned i) const;
void BitClear(unsigned i);
void BitSet(unsigned i);
bool GetBit(unsigned i) const;
void BitClear(unsigned i);
void BitSet(unsigned i);
UCC
git Repository :: git.ucc.asn.au