X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Futils.h;h=25af815c447d38d45bde664514f34c68aa329e67;hp=1cac625624501ab1725d870afbe98ac0a469fd01;hb=4be8b22ca5bfa6878bd746383c7e347e5687293b;hpb=d7c5ca75b0fc9e58a8676681e3801869e47ad911 diff --git a/ginac/utils.h b/ginac/utils.h index 1cac6256..25af815c 100644 --- a/ginac/utils.h +++ b/ginac/utils.h @@ -4,7 +4,7 @@ * of any interest to the user of the library. */ /* - * GiNaC Copyright (C) 1999-2007 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2016 Johannes Gutenberg University Mainz, Germany * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,15 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __GINAC_UTILS_H__ -#define __GINAC_UTILS_H__ +#ifndef GINAC_UTILS_H +#define GINAC_UTILS_H -#include "config.h" +#include "assertion.h" -#include #include - -#include "assertion.h" +#include // for uintptr_t +#include namespace GiNaC { @@ -45,7 +44,7 @@ class dunno {}; unsigned log2(unsigned n); /** Rotate bits of unsigned value by one bit to the left. - * This can be necesary if the user wants to define its own hashes. */ + * This can be necessary if the user wants to define its own hashes. */ inline unsigned rotate_left(unsigned n) { return (n & 0x80000000U) ? (n << 1 | 0x00000001U) : (n << 1); @@ -65,39 +64,10 @@ inline int compare_pointers(const T * a, const T * b) return 0; } -#if SIZEOF_VOID_P == SIZEOF_INT -typedef unsigned int p_int; -#elif SIZEOF_VOID_P == SIZEOF_LONG -typedef unsigned long p_int; -#elif SIZEOF_VOID_P == SIZEOF_LONG_LONG -typedef unsigned long long p_int; -#else -typedef unsigned long p_int; -#endif - /** Truncated multiplication with golden ratio, for computing hash values. */ -inline unsigned golden_ratio_hash(p_int n) +inline unsigned golden_ratio_hash(uintptr_t n) { - // This function works much better when fast arithmetic with at - // least 64 significant bits is available. -#if SIZEOF_LONG >= 8 - // So 'long' has 64 bits. Excellent! We prefer it because it might be - // more efficient than 'long long'. - unsigned long l = n * 0x4f1bbcddUL; - return (unsigned)l; -#elif SIZEOF_LONG_LONG >= 8 - // This requires 'long long' (or an equivalent 64 bit type)---which is, - // unfortunately, not ANSI-C++-compliant. - // (Yet C99 demands it, which is reason for hope.) - unsigned long long l = n * 0x4f1bbcddULL; - return (unsigned)l; -#else - // Without a type with 64 significant bits do the multiplication manually - // by splitting n up into the lower and upper two bytes. - const unsigned n0 = (n & 0x0000ffffU); - const unsigned n1 = (n & 0xffff0000U) >> 16; - return (n0 * 0x0000bcddU) + ((n1 * 0x0000bcddU + n0 * 0x00004f1bU) << 16); -#endif + return n * UINT64_C(0x4f1bbcdd); } /* Compute the sign of a permutation of a container, with and without an @@ -106,6 +76,7 @@ inline unsigned golden_ratio_hash(p_int n) template int permutation_sign(It first, It last) { + using std::swap; if (first == last) return 0; --last; @@ -120,13 +91,15 @@ int permutation_sign(It first, It last) bool swapped = false; while (i != first) { if (*i < *other) { - std::iter_swap(other, i); + swap(*other, *i); flag = other; swapped = true; sign = -sign; } else if (!(*other < *i)) return 0; - --i; --other; + --i; + if (i != first) + --other; } if (!swapped) return sign; @@ -139,13 +112,15 @@ int permutation_sign(It first, It last) swapped = false; while (i != last) { if (*other < *i) { - std::iter_swap(i, other); + swap(*i, *other); flag = other; swapped = true; sign = -sign; } else if (!(*i < *other)) return 0; - ++i; ++other; + ++i; + if (i != last) + ++other; } if (!swapped) return sign; @@ -179,7 +154,9 @@ int permutation_sign(It first, It last, Cmp comp, Swap swapit) sign = -sign; } else if (!comp(*other, *i)) return 0; - --i; --other; + --i; + if (i != first) + --other; } if (!swapped) return sign; @@ -198,7 +175,9 @@ int permutation_sign(It first, It last, Cmp comp, Swap swapit) sign = -sign; } else if (!comp(*i, *other)) return 0; - ++i; ++other; + ++i; + if (i != last) + ++other; } if (!swapped) return sign; @@ -230,7 +209,9 @@ void shaker_sort(It first, It last, Cmp comp, Swap swapit) flag = other; swapped = true; } - --i; --other; + --i; + if (i != first) + --other; } if (!swapped) return; @@ -247,7 +228,9 @@ void shaker_sort(It first, It last, Cmp comp, Swap swapit) flag = other; swapped = true; } - ++i; ++other; + ++i; + if (i != last) + ++other; } if (!swapped) return; @@ -402,21 +385,7 @@ extern const ex _ex120; // Helper macros for class implementations (mostly useful for trivial classes) #define DEFAULT_CTOR(classname) \ -classname::classname() : inherited(&classname::tinfo_static) { setflag(status_flags::evaluated | status_flags::expanded); } - -#define DEFAULT_UNARCHIVE(classname) \ -ex classname::unarchive(const archive_node &n, lst &sym_lst) \ -{ \ - return (new classname(n, sym_lst))->setflag(status_flags::dynallocated); \ -} - -#define DEFAULT_ARCHIVING(classname) \ -classname::classname(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) {} \ -DEFAULT_UNARCHIVE(classname) \ -void classname::archive(archive_node &n) const \ -{ \ - inherited::archive(n); \ -} +classname::classname() { setflag(status_flags::evaluated | status_flags::expanded); } #define DEFAULT_COMPARE(classname) \ int classname::compare_same_type(const basic & other) const \ @@ -440,5 +409,4 @@ void classname::do_print_latex(const print_latex & c, unsigned level) const \ } // namespace GiNaC - -#endif // ndef __GINAC_UTILS_H__ +#endif // ndef GINAC_UTILS_H