- GiNaC-devel - ginac.de

[PATCH] Fix get_builtin_reader() and make it a bit simpler.
by Alexei Sheplyakov 10 Aug '09

10 Aug '09

The code below seems to be too incorrect or at least too fragile enum { log, exp, // skipped NFUNCTIONS }; std::vector<function_options>::const_iterator it = registered_functions_hack::get_registered_functions().begin(); unsigned serial = 0; for ( ; serial<NFUNCTIONS; ++it, ++serial ) { prototype proto = make_pair(it->get_name(), it->get_nparams()); reader[proto] = encode_serial_as_reader_func(serial); } What happens if a user-defined function(s) get registered *before* "official" ones (so serials of built-in functions won't start from 0)? This can easily happen because the order of initialization in different compilation units is implementation defined. Or someone adds a built-in function and inserts REGISTER_FUNCTION_*P between REGISTER_FUNCTION_1P(log, ...) and REGISTER_FUNCTION_1P(exp, ...)? Or compiler decides to swap REGISTER_FUNCTION_1P(log, ...) and REGISTER_FUNCTION_1P(exp, ...)? The fix is simple: don't fiddle with serials, use the old (pre 1.5.2) approach, that is, let autogen produce the `reader functions' and use them to make a prototype_table. --- ginac/parser/builtin_fcns.def | 84 ++++++++++++++++++++++++++++++++++++++- ginac/parser/default_reader.tpl | 56 ++++---------------------- 2 files changed, 92 insertions(+), 48 deletions(-) diff --git a/ginac/parser/builtin_fcns.def b/ginac/parser/builtin_fcns.def index 96cd0a2..a7379d0 100644 --- a/ginac/parser/builtin_fcns.def +++ b/ginac/parser/builtin_fcns.def @@ -1,14 +1,96 @@ Autogen definitions ginacfcns; +function = { name = "log"; }; +function = { name = "exp"; }; +function = { name = "sin"; }; +function = { name = "cos"; }; +function = { name = "tan"; }; +function = { name = "asin"; }; +function = { name = "acos"; }; +function = { name = "atan"; }; + +function = { name = "sinh"; }; +function = { name = "cosh"; }; +function = { name = "tanh"; }; +function = { name = "asinh"; }; +function = { name = "acosh"; }; +function = { name = "atanh"; }; + +function = { + name = "atan2"; + args = 2; +}; + +function = { + name = "Li2"; + comment = "Dilogarithm"; +}; + +function = { + name = "Li3"; + comment = "Trilogarithm"; +}; + +function = { + name = "zetaderiv"; + comment = "Derivatives of Riemann's Zeta-function"; + args = 2; +}; + +function = { + name = "Li"; + args = 2; + comment = "Polylogarithm and multiple polylogarithm"; +}; + +function = { + name = "S"; + args = 3; + comment = "Nielsen's generalized polylogarithm"; +}; + +function = { + name = "H"; + args = 2; + comment = "Harmonic polylogarithm"; +}; + +function = { name = "lgamma"; }; +function = { name = "tgamma"; }; + +function = { + name = "beta"; + args = 2; + comment = "Beta-function"; +}; + +function = { name = "factorial"; }; + +function = { + name = "binomial"; + args = 2; +}; + +function = { + name = "Order"; + comment = "Order term function (for truncated power series)"; +}; + /* Thease are not functions, but anyway ... */ -function = { name = "sqrt"; }; +function = { + name = "sqrt"; + quasi = 1; +}; function = { name = "pow"; args = 2; + quasi = 1; }; function = { name = "power"; args = 2; + quasi = 1; }; + diff --git a/ginac/parser/default_reader.tpl b/ginac/parser/default_reader.tpl index e65802a..32f20f4 100644 --- a/ginac/parser/default_reader.tpl +++ b/ginac/parser/default_reader.tpl @@ -62,10 +62,10 @@ const prototype_table& get_default_reader() static bool initialized = false; static prototype_table reader; if (!initialized) { - [+ FOR function +] + [+ FOR function +][+ IF (exist? "quasi") +] reader[make_pair("[+ (get "name") +]", [+ (if (exist? "args") (get "args") "1") - +])] = [+ (get "name") +]_reader;[+ + +])] = [+ (get "name") +]_reader;[+ ENDIF +][+ ENDFOR +] std::vector<function_options>::const_iterator it = registered_functions_hack::get_registered_functions().begin(); @@ -87,51 +87,13 @@ const prototype_table& get_builtin_reader() using std::make_pair; static bool initialized = false; static prototype_table reader; - if (!initialized) { - [+ FOR function +] - reader[make_pair("[+ (get "name") +]", [+ - (if (exist? "args") (get "args") "1") - +])] = [+ (get "name") +]_reader;[+ - ENDFOR +] - enum { - log, - exp, - sin, - cos, - tan, - asin, - acos, - atan, - sinh, - cosh, - tanh, - asinh, - acosh, - atanh, - atan2, - Li2, - Li3, - zetaderiv, - Li, - S, - H, - lgamma, - tgamma, - beta, - factorial, - binomial, - Order, - NFUNCTIONS - }; - std::vector<function_options>::const_iterator it = - registered_functions_hack::get_registered_functions().begin(); - unsigned serial = 0; - for ( ; serial<NFUNCTIONS; ++it, ++serial ) { - prototype proto = make_pair(it->get_name(), it->get_nparams()); - reader[proto] = encode_serial_as_reader_func(serial); - } - initialized = true; - } + if (initialized) + return reader; + [+ FOR function +] + reader[make_pair("[+ (get "name") +]", [+ + (if (exist? "args") (get "args") "1") + +])] = [+ (get "name") +]_reader;[+ + ENDFOR +] return reader; } -- 1.6.3.3

1 0

[SCM] GiNaC -- a C++ library for symbolic computations branch, ginac_1-5, updated. release_1-4-0-210-g3f1026f
by git＠ginac.de 10 Aug '09

10 Aug '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "GiNaC -- a C++ library for symbolic computations". The branch, ginac_1-5 has been updated via 3f1026f0540e4e7ab86656389d09c2152269e6cf (commit) via ab8da4fe0687969d124c2c3b3e6ce62a63376a0a (commit) via dd19b7316b6eba5c49b6a4fb3503c504ec6c866a (commit) via 7f4a4ce46d799ba888b118dfdc8945c92a6c6d6f (commit) via 4ddeb4c2a625a069d71b510aab3ae53138670470 (commit) via 99c7ff6b72691f2eff30f94934d65d1ba7136ff9 (commit) via 554722426543a6e1445ead11167107a69fd21af9 (commit) via aa1afbbdb118846cfc266a1d7a8d5188ac214e0e (commit) via 14aeeca161c7cc2d145b0778ac234341068efef1 (commit) from 5252d38313c423465b9bc37b0618cb8de96d0d4e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3f1026f0540e4e7ab86656389d09c2152269e6cf Author: Alexei Sheplyakov <varg(a)metalica.kh.ua> Date: Sat Aug 8 13:03:15 2009 +0300 modular_matrix: don't use STL iterators in {mul, sub}_col and friends. Not using STL iterators makes the code simpler and cleaner. Also we don't have to argue whether the standard ([lib.random.access.iterators]) imposes any pre/post-condictions on operator+=. (cherry picked from commit 59ec13895c97ffd74979a0b811a7571f6de56386) commit ab8da4fe0687969d124c2c3b3e6ce62a63376a0a Author: Jens Vollinga <jensv(a)nikhef.nl> Date: Sun Aug 9 23:38:48 2009 +0200 Added get_builtin_reader() that parses only the builtin GiNaC functions and pow, sqrt, and power. commit dd19b7316b6eba5c49b6a4fb3503c504ec6c866a Author: Jens Vollinga <jensv(a)nikhef.nl> Date: Sun Aug 9 23:27:10 2009 +0200 Fixed include of stdint.h (parser.cpp needs the header as well). commit 7f4a4ce46d799ba888b118dfdc8945c92a6c6d6f Author: Alexei Sheplyakov <varg(a)metalica.kh.ua> Date: Sat Aug 8 13:03:48 2009 +0300 shaker_sort, permutation_sign: fix invalid use of STL iterators. According to the standard incrementing end(), and decrementing begin() are ill-defined operations (see [lib.forward.iterators], [lib.bidirectional.iterators]). (cherry picked from commit 694f839947982f5b12b6c629d5bab522c801630d) commit 4ddeb4c2a625a069d71b510aab3ae53138670470 Author: Alexei Sheplyakov <varg(a)metalica.kh.ua> Date: Sat Aug 8 13:07:14 2009 +0300 symmetry::calchash(): be careful to not dereference past-the-end iterator. (cherry picked from commit 526825bcee294cb20e37d8db6d5040ba0f8c428f) commit 99c7ff6b72691f2eff30f94934d65d1ba7136ff9 Author: Alexei Sheplyakov <varg(a)metalica.kh.ua> Date: Sat Aug 8 13:06:36 2009 +0300 check_parameter_G: fix pontential increment of end(). Incrementing past-the-end iterator is not permitted by the standard, see [lib.input.iterators]. (cherry picked from commit 49a44f7d55ec0d6686d3c32c7081a07d10c93274) commit 554722426543a6e1445ead11167107a69fd21af9 Author: Alexei Sheplyakov <varg(a)metalica.kh.ua> Date: Sat Aug 8 13:02:47 2009 +0300 G_eval: fix incorrect use of STL iterator. According to [lib.bidirectional.iterators] it's not OK to decrement an iterator pointing to the beginning of the sequence. Fortunately random access iterators provided by (current versions of) gcc/libstdc++ don't have this silly limitation, so the code which works with pointers works with iterators without any changes at all. However, - there's no guarantee that the current behavior won't change in the future - some non-GNU compilers are not that smart (i.e. the program segfaults upon when decrementing beginning-of-the-sequence iterator). (cherry picked from commit dda45abd8a2c408f8b3eb7959a10dfb2468ecc3a) commit aa1afbbdb118846cfc266a1d7a8d5188ac214e0e Author: Alexei Sheplyakov <varg(a)metalica.kh.ua> Date: Sat Aug 8 11:43:12 2009 +0300 Fix the compliation error *for real* ... and restore performance Commit 8bf0597dde55e4c94a2ff39f1d8130902e3d7a9b (titled as 'Fixed the parser such that it can read in user defined classes again.') made the parser a bit slower, especially if the input contains many terms of user-defined type. The reason for that is quite simple: we throw and catch an exception every time we construct an object of user-defined type: // dirty hack to distinguish between serial numbers of functions and real // pointers. GiNaC::function* f = NULL; try { unsigned serial = (unsigned)(unsigned long)(void *)(reader->second); f = new GiNaC::function(serial, args); } catch ( std::runtime_error ) { if ( f ) delete f; ex ret = reader->second(args); return ret; } Fortunately functions are aligned and we can use much more efficient technique to distinguish between serial and pointers to functions. commit 14aeeca161c7cc2d145b0778ac234341068efef1 Author: Alexei Sheplyakov <varg(a)metalica.kh.ua> Date: Fri Aug 7 23:22:18 2009 +0300 Fix the compliation error *for real* ----------------------------------------------------------------------- Summary of changes: ginac/factor.cpp | 60 +++++++++-------------- ginac/inifcns_nstdsums.cpp | 7 ++- ginac/parser/default_reader.tpl | 104 +++++++++++++++++++++++++++++++++------ ginac/parser/parse_context.h | 14 +++++- ginac/parser/parser.cpp | 46 +++++++++++++----- ginac/symmetry.cpp | 3 +- ginac/utils.h | 24 +++++++-- 7 files changed, 183 insertions(+), 75 deletions(-) hooks/post-receive -- GiNaC -- a C++ library for symbolic computations

2 1

[PATCH 5/6] ncmul::eval(): don't write beyond the end of the vector.
by Alexei Sheplyakov 10 Aug '09

10 Aug '09

--- ginac/ncmul.cpp | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ginac/ncmul.cpp b/ginac/ncmul.cpp index 0c22a81..fff307d 100644 --- a/ginac/ncmul.cpp +++ b/ginac/ncmul.cpp @@ -339,15 +339,15 @@ ex ncmul::eval(int level) const if (assocseq.empty()) return _ex1; // determine return types - unsignedvector rettypes; - rettypes.reserve(assocseq.size()); + unsignedvector rettypes(assocseq.size()); size_t i = 0; size_t count_commutative=0; size_t count_noncommutative=0; size_t count_noncommutative_composite=0; cit = assocseq.begin(); citend = assocseq.end(); while (cit != citend) { - switch (rettypes[i] = cit->return_type()) { + rettypes[i] = cit->return_type(); + switch (rettypes[i]) { case return_types::commutative: count_commutative++; break; -- 1.6.3.3

2 3

[SCM] GiNaC -- a C++ library for symbolic computations branch, ginac_1-5, updated. release_1-4-0-211-g7a2ac48
by git＠ginac.de 10 Aug '09

10 Aug '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "GiNaC -- a C++ library for symbolic computations". The branch, ginac_1-5 has been updated via 7a2ac48810afb303e1580afb6266876dda3c5da0 (commit) from 3f1026f0540e4e7ab86656389d09c2152269e6cf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7a2ac48810afb303e1580afb6266876dda3c5da0 Author: Alexei Sheplyakov <varg(a)metalica.kh.ua> Date: Sat Aug 8 13:03:38 2009 +0300 ncmul::eval(): don't write beyond the end of the vector. ----------------------------------------------------------------------- Summary of changes: ginac/ncmul.cpp | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- GiNaC -- a C++ library for symbolic computations

1 0

[SCM] GiNaC -- a C++ library for symbolic computations branch, master, updated. release_1-4-0-197-g59ec138
by git＠ginac.de 09 Aug '09

09 Aug '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "GiNaC -- a C++ library for symbolic computations". The branch, master has been updated via 59ec13895c97ffd74979a0b811a7571f6de56386 (commit) via 694f839947982f5b12b6c629d5bab522c801630d (commit) via 526825bcee294cb20e37d8db6d5040ba0f8c428f (commit) via 49a44f7d55ec0d6686d3c32c7081a07d10c93274 (commit) via dda45abd8a2c408f8b3eb7959a10dfb2468ecc3a (commit) from 619879b5bd86a99334affe1f05d17616cc2c1898 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 59ec13895c97ffd74979a0b811a7571f6de56386 Author: Alexei Sheplyakov <varg(a)metalica.kh.ua> Date: Sat Aug 8 13:03:15 2009 +0300 modular_matrix: don't use STL iterators in {mul, sub}_col and friends. Not using STL iterators makes the code simpler and cleaner. Also we don't have to argue whether the standard ([lib.random.access.iterators]) imposes any pre/post-condictions on operator+=. commit 694f839947982f5b12b6c629d5bab522c801630d Author: Alexei Sheplyakov <varg(a)metalica.kh.ua> Date: Sat Aug 8 13:03:48 2009 +0300 shaker_sort, permutation_sign: fix invalid use of STL iterators. According to the standard incrementing end(), and decrementing begin() are ill-defined operations (see [lib.forward.iterators], [lib.bidirectional.iterators]). commit 526825bcee294cb20e37d8db6d5040ba0f8c428f Author: Alexei Sheplyakov <varg(a)metalica.kh.ua> Date: Sat Aug 8 13:07:14 2009 +0300 symmetry::calchash(): be careful to not dereference past-the-end iterator. commit 49a44f7d55ec0d6686d3c32c7081a07d10c93274 Author: Alexei Sheplyakov <varg(a)metalica.kh.ua> Date: Sat Aug 8 13:06:36 2009 +0300 check_parameter_G: fix pontential increment of end(). Incrementing past-the-end iterator is not permitted by the standard, see [lib.input.iterators]. commit dda45abd8a2c408f8b3eb7959a10dfb2468ecc3a Author: Alexei Sheplyakov <varg(a)metalica.kh.ua> Date: Sat Aug 8 13:02:47 2009 +0300 G_eval: fix incorrect use of STL iterator. According to [lib.bidirectional.iterators] it's not OK to decrement an iterator pointing to the beginning of the sequence. Fortunately random access iterators provided by (current versions of) gcc/libstdc++ don't have this silly limitation, so the code which works with pointers works with iterators without any changes at all. However, - there's no guarantee that the current behavior won't change in the future - some non-GNU compilers are not that smart (i.e. the program segfaults upon when decrementing beginning-of-the-sequence iterator). ----------------------------------------------------------------------- Summary of changes: ginac/factor.cpp | 60 +++++++++++++++++--------------------------- ginac/inifcns_nstdsums.cpp | 7 +++- ginac/symmetry.cpp | 3 +- ginac/utils.h | 24 +++++++++++++---- 4 files changed, 48 insertions(+), 46 deletions(-) hooks/post-receive -- GiNaC -- a C++ library for symbolic computations

1 0

[SCM] GiNaC -- a C++ library for symbolic computations branch, ginac_1-5, updated. release_1-4-0-198-g8bf0597
by git＠ginac.de 08 Aug '09

08 Aug '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "GiNaC -- a C++ library for symbolic computations". The branch, ginac_1-5 has been updated via 8bf0597dde55e4c94a2ff39f1d8130902e3d7a9b (commit) via eaf81b3115697a8e883848ace0ceb919cf443b2c (commit) from eb192338b3abd1252523a013a4f924ee38b10039 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8bf0597dde55e4c94a2ff39f1d8130902e3d7a9b Author: Jens Vollinga <jensv(a)balin.nikhef.nl> Date: Fri Jul 31 12:48:58 2009 +0200 Fixed the parser such that it can read in user defined classes again. Fixed default reader to parse also pow, sqrt and power. commit eaf81b3115697a8e883848ace0ceb919cf443b2c Author: Jens Vollinga <jensv(a)balin.nikhef.nl> Date: Fri Jul 31 11:14:01 2009 +0200 Fixed cast that caused compile error on 64bit machines. ----------------------------------------------------------------------- Summary of changes: ginac/function.pl | 3 ++ ginac/parser/builtin_fcns.def | 76 --------------------------------------- ginac/parser/default_reader.tpl | 5 +++ ginac/parser/parser.cpp | 12 +++++- 4 files changed, 18 insertions(+), 78 deletions(-) hooks/post-receive -- GiNaC -- a C++ library for symbolic computations

4 11

[PATCH 4/6] symmetry::calchash(): be careful to not dereference past-the-end iterator.
by Alexei Sheplyakov 08 Aug '09

08 Aug '09

--- ginac/symmetry.cpp | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ginac/symmetry.cpp b/ginac/symmetry.cpp index 9e00a8c..725506f 100644 --- a/ginac/symmetry.cpp +++ b/ginac/symmetry.cpp @@ -190,7 +190,8 @@ unsigned symmetry::calchash() const if (type == none) { v = rotate_left(v); - v ^= *(indices.begin()); + if (!indices.empty()) + v ^= *(indices.begin()); } else { for (exvector::const_iterator i=children.begin(); i!=children.end(); ++i) { -- 1.6.3.3

1 0

[PATCH 2/6] check_parameter_G: fix pontential increment of end().
by Alexei Sheplyakov 08 Aug '09

08 Aug '09

Incrementing past-the-end iterator is not permitted by the standard, see [lib.input.iterators]. --- ginac/inifcns_nstdsums.cpp | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ginac/inifcns_nstdsums.cpp b/ginac/inifcns_nstdsums.cpp index b410533..11a91dd 100644 --- a/ginac/inifcns_nstdsums.cpp +++ b/ginac/inifcns_nstdsums.cpp @@ -659,6 +659,8 @@ Gparameter::const_iterator check_parameter_G(const Gparameter& a, int scale, ++trailing_zeros; } } + if (lastnonzero == a.end()) + return a.end(); return ++lastnonzero; } -- 1.6.3.3

1 0

[PATCH 6/6] shaker_sort, permutation_sign: fix invalid use of STL iterators.
by Alexei Sheplyakov 08 Aug '09

08 Aug '09

According to the standard incrementing end(), and decrementing begin() are ill-defined operations (see [lib.forward.iterators], [lib.bidirectional.iterators]). --- ginac/utils.h | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ginac/utils.h b/ginac/utils.h index 393c474..e65bdae 100644 --- a/ginac/utils.h +++ b/ginac/utils.h @@ -128,7 +128,9 @@ int permutation_sign(It first, It last) sign = -sign; } else if (!(*other < *i)) return 0; - --i; --other; + --i; + if (i != first) + --other; } if (!swapped) return sign; @@ -147,7 +149,9 @@ int permutation_sign(It first, It last) sign = -sign; } else if (!(*i < *other)) return 0; - ++i; ++other; + ++i; + if (i != last) + ++other; } if (!swapped) return sign; @@ -181,7 +185,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; @@ -200,7 +206,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; @@ -232,7 +240,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; @@ -249,7 +259,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; -- 1.6.3.3

1 0

[PATCH 3/6] modular_matrix: don't use STL iterators in {mul, sub}_col and friends.
by Alexei Sheplyakov 08 Aug '09

08 Aug '09

Not using STL iterators makes the code simpler and cleaner. Also we don't have to argue whether the standard ([lib.random.access.iterators]) imposes any pre/post-condictions on operator+=. --- ginac/factor.cpp | 60 ++++++++++++++++++++--------------------------------- 1 files changed, 23 insertions(+), 37 deletions(-) diff --git a/ginac/factor.cpp b/ginac/factor.cpp index 2f9157b..c82e744 100644 --- a/ginac/factor.cpp +++ b/ginac/factor.cpp @@ -691,90 +691,76 @@ public: cl_MI operator()(size_t row, size_t col) const { return m[row*c + col]; } void mul_col(size_t col, const cl_MI x) { - mvec::iterator i = m.begin() + col; for ( size_t rc=0; rc<r; ++rc ) { - *i = *i * x; - i += c; + std::size_t i = c*rc + col; + m[i] = m[i] * x; } } void sub_col(size_t col1, size_t col2, const cl_MI fac) { - mvec::iterator i1 = m.begin() + col1; - mvec::iterator i2 = m.begin() + col2; for ( size_t rc=0; rc<r; ++rc ) { - *i1 = *i1 - *i2 * fac; - i1 += c; - i2 += c; + std::size_t i1 = col1 + c*rc; + std::size_t i2 = col2 + c*rc; + m[i1] = m[i1] - m[i2]*fac; } } void switch_col(size_t col1, size_t col2) { - cl_MI buf; - mvec::iterator i1 = m.begin() + col1; - mvec::iterator i2 = m.begin() + col2; for ( size_t rc=0; rc<r; ++rc ) { - buf = *i1; *i1 = *i2; *i2 = buf; - i1 += c; - i2 += c; + std::size_t i1 = col1 + rc*c; + std::size_t i2 = col2 + rc*c; + std::swap(m[i1], m[i2]); } } void mul_row(size_t row, const cl_MI x) { - vector<cl_MI>::iterator i = m.begin() + row*c; for ( size_t cc=0; cc<c; ++cc ) { - *i = *i * x; - ++i; + std::size_t i = row*c + cc; + m[i] = m[i] * x; } } void sub_row(size_t row1, size_t row2, const cl_MI fac) { - vector<cl_MI>::iterator i1 = m.begin() + row1*c; - vector<cl_MI>::iterator i2 = m.begin() + row2*c; for ( size_t cc=0; cc<c; ++cc ) { - *i1 = *i1 - *i2 * fac; - ++i1; - ++i2; + std::size_t i1 = row1*c + cc; + std::size_t i2 = row2*c + cc; + m[i1] = m[i1] - m[i2]*fac; } } void switch_row(size_t row1, size_t row2) { - cl_MI buf; - vector<cl_MI>::iterator i1 = m.begin() + row1*c; - vector<cl_MI>::iterator i2 = m.begin() + row2*c; for ( size_t cc=0; cc<c; ++cc ) { - buf = *i1; *i1 = *i2; *i2 = buf; - ++i1; - ++i2; + std::size_t i1 = row1*c + cc; + std::size_t i2 = row2*c + cc; + std::swap(m[i1], m[i2]); } } bool is_col_zero(size_t col) const { mvec::const_iterator i = m.begin() + col; for ( size_t rr=0; rr<r; ++rr ) { - if ( !zerop(*i) ) { + std::size_t i = col + rr*c; + if ( !zerop(m[i]) ) { return false; } - i += c; } return true; } bool is_row_zero(size_t row) const { - mvec::const_iterator i = m.begin() + row*c; for ( size_t cc=0; cc<c; ++cc ) { - if ( !zerop(*i) ) { + std::size_t i = row*c + cc; + if ( !zerop(m[i]) ) { return false; } - ++i; } return true; } void set_row(size_t row, const vector<cl_MI>& newrow) { - mvec::iterator i1 = m.begin() + row*c; - mvec::const_iterator i2 = newrow.begin(), end = newrow.end(); - for ( ; i2 != end; ++i1, ++i2 ) { - *i1 = *i2; + for (std::size_t i2 = 0; i2 < newrow.size(); ++i2) { + std::size_t i1 = row*c + i2; + m[i1] = newrow[i2]; } } mvec::const_iterator row_begin(size_t row) const { return m.begin()+row*c; } -- 1.6.3.3

1 0