diff options
author | Tim King <taking@cs.nyu.edu> | 2012-02-15 21:52:16 +0000 |
---|---|---|
committer | Tim King <taking@cs.nyu.edu> | 2012-02-15 21:52:16 +0000 |
commit | 9a0a59d5c85c4a1d2469f43e9d2b433e156810ba (patch) | |
tree | ba66b1c5cdeec062ce4144a463ec0b61a83e3cc6 /src/util/integer_cln_imp.h | |
parent | 093fa1757392e7bfc18493f2daa87ff540aeea86 (diff) |
This commit merges into trunk the branch branches/arithmetic/integers2 from r2650 to r2779.
- This excludes revision 2777. This revision had some strange performance implications and was delaying the merge.
- This includes the new DioSolver. The DioSolver can discover conflicts, produce substitutions, and produce cuts.
- The DioSolver can be disabled at command line using --disable-dio-solver.
- This includes a number of changes to the arithmetic normal form.
- The Integer class features a number of new number theoretic function.
- This commit includes a few rather loud warning. I will do my best to take care of them today.
Diffstat (limited to 'src/util/integer_cln_imp.h')
-rw-r--r-- | src/util/integer_cln_imp.h | 103 |
1 files changed, 103 insertions, 0 deletions
diff --git a/src/util/integer_cln_imp.h b/src/util/integer_cln_imp.h index f8ffc0d65..06459e3e1 100644 --- a/src/util/integer_cln_imp.h +++ b/src/util/integer_cln_imp.h @@ -167,6 +167,7 @@ public: return *this; } + /* Integer operator/(const Integer& y) const { return Integer( cln::floor1(d_value, y.d_value) ); } @@ -182,6 +183,65 @@ public: d_value = cln::floor2(d_value, y.d_value).remainder; return *this; } + */ + + /** + * Return this*(2^pow). + */ + Integer multiplyByPow2(uint32_t pow) const { + cln::cl_I ipow(pow); + return Integer( d_value << ipow); + } + + /** See CLN Documentation. */ + Integer extractBitRange(uint32_t bitCount, uint32_t low) const { + cln::cl_byte range(bitCount, low); + return Integer(cln::ldb(d_value, range)); + } + + /** + * Returns the floor(this / y) + */ + Integer floorDivideQuotient(const Integer& y) const { + return Integer( cln::floor1(d_value, y.d_value) ); + } + + /** + * Returns r == this - floor(this/y)*y + */ + Integer floorDivideRemainder(const Integer& y) const { + return Integer( cln::floor2(d_value, y.d_value).remainder ); + } + /** + * Computes a floor quoient and remainder for x divided by y. + */ + static void floorQR(Integer& q, Integer& r, const Integer& x, const Integer& y) { + cln::cl_I_div_t res = cln::floor2(x.d_value, y.d_value); + q.d_value = res.quotient; + r.d_value = res.remainder; + } + + /** + * Returns the ceil(this / y) + */ + Integer ceilingDivideQuotient(const Integer& y) const { + return Integer( cln::ceiling1(d_value, y.d_value) ); + } + + /** + * Returns the ceil(this / y) + */ + Integer ceilingDivideRemainder(const Integer& y) const { + return Integer( cln::ceiling2(d_value, y.d_value).remainder ); + } + + /** + * If y divides *this, then exactQuotient returns (this/y) + */ + Integer exactQuotient(const Integer& y) const { + Assert(y.divides(*this)); + return Integer( cln::exquo(d_value, y.d_value) ); + } /** * Raise this Integer to the power <code>exp</code>. @@ -208,6 +268,22 @@ public: } /** + * Return the least common multiple of this integer with another. + */ + Integer lcm(const Integer& y) const { + cln::cl_I result = cln::lcm(d_value, y.d_value); + return Integer(result); + } + + /** + * Return true if *this exactly divides y. + */ + bool divides(const Integer& y) const { + cln::cl_I result = cln::rem(y.d_value, d_value); + return cln::zerop(result); + } + + /** * Return the absolute value of this integer. */ Integer abs() const { @@ -243,6 +319,12 @@ public: return output; } + int sgn() const { + cln::cl_I sgn = cln::signum(d_value); + Assert(sgn == 0 || sgn == -1 || sgn == 1); + return cln::cl_I_to_int(sgn); + } + //friend std::ostream& operator<<(std::ostream& os, const Integer& n); long getLong() const { @@ -281,6 +363,27 @@ public: return cln::logbitp(n, d_value); } + /** + * If x != 0, returns the unique n s.t. 2^{n-1} <= abs(x) < 2^{n}. + * If x == 0, returns 1. + */ + size_t length() const { + int s = sgn(); + if(s == 0){ + return 1; + }else if(s < 0){ + return cln::integer_length(-d_value); + }else{ + return cln::integer_length(d_value); + } + } + +/* cl_I xgcd (const cl_I& a, const cl_I& b, cl_I* u, cl_I* v) */ +/* This function ("extended gcd") returns the greatest common divisor g of a and b and at the same time the representation of g as an integral linear combination of a and b: u and v with u*a+v*b = g, g >= 0. u and v will be normalized to be of smallest possible absolute value, in the following sense: If a and b are non-zero, and abs(a) != abs(b), u and v will satisfy the inequalities abs(u) <= abs(b)/(2*g), abs(v) <= abs(a)/(2*g). */ + static void extendedGcd(Integer& g, Integer& s, Integer& t, const Integer& a, const Integer& b){ + g.d_value = cln::xgcd(a.d_value, b.d_value, &s.d_value, &t.d_value); + } + friend class CVC4::Rational; };/* class Integer */ |