- GiNaC-devel - ginac.de

[SCM] GiNaC -- a C++ library for symbolic computations branch, master, updated. release_1-4-0-101-gb815027
by git＠ginac.de 09 Sep '08

09 Sep '08

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 b8150271ff497c2ef0c2a8748f5f53b4f1bab7c8 (commit) via 7d23da3e0ee0d03f90f47585ea27f86ecbfe866b (commit) via 416f530b032f2861bb3cb96d23f14097237a87ea (commit) via c647bf0942d660691272a8a2f4d7e5a3c0f6eb0f (commit) via 93eb93a10a2f29360baa4ab45d5b34b982c7fa5c (commit) via a32a30d8ccdd0eb945b8180c8fe82d154e9280de (commit) via e677a783b3c986ceb873a580a18f2214ad6de52c (commit) via a3009dfc5402f6253e9219201f48d972dd46984b (commit) via 4a9f6c276daf54acbb2f5951f0435bfb6f014809 (commit) via b21923803208edf7ec3b0bfaa51f813cb25a0d86 (commit) via 66633e0aca7656c2826e2fd06dc638eac8900660 (commit) via 0f26d08929532724d24a60e9fa5e5e98c4b2fa55 (commit) via db751462877f91d8b76a0fd80d48330eddcb7095 (commit) via 192ed7390b7b2b705ad100e3db0a92eedd2b20ad (commit) via aff357309f6611a59efb10d06d3dcfd3812a9ec5 (commit) via 1776cd33da528c878ef1fb5530f8ac788e445ee5 (commit) via eaa0370ac188561e02195a377b252b4caf5ab57a (commit) via dae52def8dd15914d32c94c2c21e2bd8419b65bb (commit) via 773570d668a8a86d4c646dfe9d8572746329652c (commit) via 85dbe3f2049dce7d43a1bd956d622f4ff5c0c156 (commit) via 581244b7b8fc9b5f81291e1a3f5731939e3f3d8e (commit) from bb6b3d82cdf9e7ff4ecac89c47e63024e39ec96b (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 b8150271ff497c2ef0c2a8748f5f53b4f1bab7c8 Merge: 7d23da3e0ee0d03f90f47585ea27f86ecbfe866b c647bf0942d660691272a8a2f4d7e5a3c0f6eb0f Author: Jens Vollinga <jensv(a)nikhef.nl> Date: Tue Sep 9 22:42:50 2008 +0200 Merge branch 'master' of git://ffmssmsc.jinr.ru:443/varg/ginac commit 7d23da3e0ee0d03f90f47585ea27f86ecbfe866b Author: Jens Vollinga <jensv(a)nikhef.nl> Date: Tue Sep 9 22:41:39 2008 +0200 Bug fix related to the usage of int instead of cl_I. commit 416f530b032f2861bb3cb96d23f14097237a87ea Author: Jens Vollinga <jensv(a)nikhef.nl> Date: Tue Sep 9 22:41:24 2008 +0200 Updated NEWS. commit c647bf0942d660691272a8a2f4d7e5a3c0f6eb0f Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Tue Sep 9 14:44:25 2008 +0400 build: shut up automake warnings, don't use GNU make extensions. Not that I really care about non-GNU makes, but those warnings are a bit annoying and can hide useful ones. commit 93eb93a10a2f29360baa4ab45d5b34b982c7fa5c Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Mon Sep 8 11:53:30 2008 +0400 build: put (almost) all auto* tools scripts into the config directory. So I can just rm -rf it to clean up the repository. commit a32a30d8ccdd0eb945b8180c8fe82d154e9280de Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Mon Sep 8 11:09:20 2008 +0400 Allow user to disable GiNaC::compile_ex (e.g. for security reasons). configure takes --{disable,enable}-excompiler argument now. It can be used to disable GiNaC::compile_ex (default is to enable it). acinclude.m4: GINAC_EXCOMPILER: new macro. Checks for libdl, allows user to disable GiNaC::compile_ex. Also it doesn't bother to check for libdl on MinGW. configure.ac: use GINAC_EXCOMPILER to check for libdl. commit e677a783b3c986ceb873a580a18f2214ad6de52c Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Sun Sep 7 22:53:07 2008 +0400 configure: run important checks first (and bail out if something is missing). Don't bother to check for optional stuff if CLN and/or standard C++ headers are missing. commit a3009dfc5402f6253e9219201f48d972dd46984b Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Sun Sep 7 22:47:01 2008 +0400 configure: don't bother to run checks which can be done at the compile time. Don't check for sizeof of various types, this can be done at the compile time. GCC optimizes away these checks, so the actual code is the same. commit 4a9f6c276daf54acbb2f5951f0435bfb6f014809 Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Sun Sep 7 22:17:55 2008 +0400 utils.h: use <stdint.h> (if available) instead of reinventing it. The argument of golden_ratio_hash() is as an integer of the same size as a void* pointer. Unfortunately ISO C++ 98 does not provide suitable typedef. Hence * use <stdint.h> if available and define p_int to uintptr_t. Note: AC_PROG_CC already checks for this header, so no extra checks are necessary. * as a fallback define p_int to be unsigned long, this works on most systems I know of (the only exception is woe64). While at it, stop including "config.h" unconditionally. commit b21923803208edf7ec3b0bfaa51f813cb25a0d86 Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Sat Sep 6 09:21:18 2008 +0400 configure: don't check for sizeof(long double), we don't use it. commit 66633e0aca7656c2826e2fd06dc638eac8900660 Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Sat Sep 6 08:51:19 2008 +0400 build: faster check for standard C++ headers. Include them all into a test program and check if it compiles (in order to reduce the run time of the `configure' script). commit 0f26d08929532724d24a60e9fa5e5e98c4b2fa55 Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Mon Jun 9 16:21:30 2008 +0400 build: don't run any ${host} binaries while checking for readline. Now GiNaC (to be more precise, ginsh) can be easily cross compiled. However, ancient versions of readline (<= 4.2) are not supported any more. commit db751462877f91d8b76a0fd80d48330eddcb7095 Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Mon Sep 8 11:50:12 2008 +0400 don't mention CVS any more, describe how to install from git. commit 192ed7390b7b2b705ad100e3db0a92eedd2b20ad Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Tue Jul 15 21:08:22 2008 +0400 match: don't modify subexpression list if expression doesn't match the pattern. As of now the match() method modifies the list of matched subexpressions (its second argument) even if the expression in question does not match the pattern. Thus, this simple program #include <ginac/ginac.h> #include <iostream> using namespace GiNaC; int main(int argc, char** argv) { symbol x; ex e = pow(x, 5); ex pattern = pow(wild(), -1); lst repl; bool test = e.match(pattern, repl); std::cout << "repl = " << repl << std::endl; } prints repl = {x} Such behaviour is a bit unexpected. Sometimes it confuses even GiNaC developers, see e.g. http://www.ginac.de/pipermail/ginac-devel/2006-April/000942.html Hence this patch. Now the above program prints repl = {} as expected. commit aff357309f6611a59efb10d06d3dcfd3812a9ec5 Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Tue Aug 19 15:39:46 2008 +0400 [BUGFIX] Reclaiming the memory allocated for static objects *is* necessary. GiNaC allocates memory for static objects (i.e. flyweights, remember tables, etc), but doesn't free it. This is OK if the program lifetime matches libginac lifetime, since the OS will reclaim that memory anyway. However, if the program lifetime is different from that of libginac, this turns into a memory leak. This happens if someone dlopen's libginac.so, and dlclose's it later on (read: if someone uses GiNaC via scripting language bindings). symbol::autoname_prefix(): there's no need for dynamical memory allocation. remember_table::remember_tables(): likewise. function::registered_functions(): likewise. lib_init::~lib_init(): if library usage count drops to 0, reclaim the memory allocated for flyweights. commit 1776cd33da528c878ef1fb5530f8ac788e445ee5 Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Tue Sep 9 11:14:57 2008 +0400 symbol: get rid of assign/unassign (for performance and other reasons). * symbol::eval() is trivial now, so compiler can inline it in some cases. * symbol takes less memory. * no functionality is lost (as C++ has associative arrays). commit eaa0370ac188561e02195a377b252b4caf5ab57a Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Tue Sep 9 10:39:26 2008 +0400 ginsh: use exmap for storing assigned symbols. C++ already have associative arrays, there's no need to re-invent them. commit dae52def8dd15914d32c94c2c21e2bd8419b65bb Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Fri Aug 29 23:44:51 2008 +0400 multiple zeta values: make crandall_Y_loop helper function reentrant. * Move crB and crG variables into initcX function (the only user of these variables). * Pass crX coefficients to crandall_Y_loop instead of using a global variable. * While at it make crandall_Y_loop and initcX functions static. commit 773570d668a8a86d4c646dfe9d8572746329652c Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Fri Aug 29 23:44:51 2008 +0400 multiple zeta values: make crandall_Z helper function reentrant. Pass the f_kj coefficients as an arguments to crandall_Z and calc_f functions instead of using global variables. commit 85dbe3f2049dce7d43a1bd956d622f4ff5c0c156 Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Mon Aug 25 19:08:36 2008 +0400 parser: improve error reporting a little bit. Introduce class 'parse_error' (which contain some info about location of the error) and throw it on parse errors. N.B.: the actual info is a bit inaccurate because lexer doesn't track the location properly yet. commit 581244b7b8fc9b5f81291e1a3f5731939e3f3d8e Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Mon Aug 25 17:49:58 2008 +0400 lexer: when switching to another output stream, clean last read character. Otherwise we prepend to the current stream the last character read from the previous stream, which is obviously incorrect. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 9 ++- INSTALL | 11 +-- NEWS | 38 ++++++++++++ acinclude.m4 | 139 +++++++++++++++++++++++++++++++++----------- check/exam_factor.cpp | 24 ++++++++ configure.ac | 67 +++++---------------- doc/examples/Makefile.am | 4 +- doc/tutorial/Makefile.am | 6 +- doc/tutorial/ginac.texi | 7 +-- ginac/basic.cpp | 8 ++- ginac/factor.cpp | 21 +++++-- ginac/function.pl | 4 +- ginac/inifcns_nstdsums.cpp | 76 +++++++++++------------- ginac/parser/debug.hpp | 13 ++++ ginac/parser/lexer.cpp | 15 +++++ ginac/parser/lexer.hpp | 3 + ginac/parser/parser.cpp | 20 ++----- ginac/parser/parser.hpp | 12 ++++ ginac/remember.cpp | 4 +- ginac/symbol.cpp | 61 +++---------------- ginac/symbol.h | 25 +------- ginac/utils.cpp | 55 ++++++++++++++++- ginac/utils.h | 23 ++++--- ginsh/ginsh.1.in | 4 +- ginsh/ginsh_parser.yy | 62 ++++++++++---------- 25 files changed, 415 insertions(+), 296 deletions(-) hooks/post-receive -- GiNaC -- a C++ library for symbolic computations

1 0

Cloning repository with Git
by Vladimir V. Kisil 09 Sep '08

09 Sep '08

Dear All, I am trying to clone GiNaC repository with the command: git clone http://www.ginac.de/ginac.git and got the message: warning: remote HEAD refers to nonexistent ref, unable to checkout. What is wrong? Best wishes, Vladimir -- Vladimir V. Kisil email: kisilv(a)maths.leeds.ac.uk -- www: http://maths.leeds.ac.uk/~kisilv/

2 1

[SCM] GiNaC -- a C++ library for symbolic computations branch, ginac_1-4, updated. release_1-4-0-56-g16a2917
by git＠ginac.de 08 Sep '08

08 Sep '08

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-4 has been updated via 16a2917040dff5c03abe4dea734101cfa3084b55 (commit) from 01500aefe13a837367c6540ffdc1953332035790 (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 16a2917040dff5c03abe4dea734101cfa3084b55 Author: Jens Vollinga <jensv(a)nikhef.nl> Date: Mon Sep 8 19:33:12 2008 +0200 Updated NEWS file. ----------------------------------------------------------------------- Summary of changes: NEWS | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) hooks/post-receive -- GiNaC -- a C++ library for symbolic computations

1 0

[SCM] GiNaC -- a C++ library for symbolic computations branch, ginac_1-4, updated. release_1-4-0-55-g01500ae
by git＠ginac.de 08 Sep '08

08 Sep '08

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-4 has been updated via 01500aefe13a837367c6540ffdc1953332035790 (commit) from e6caa2040557bdaaf2262afc0bb47dddd88e38cd (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 01500aefe13a837367c6540ffdc1953332035790 Author: Jens Vollinga <jensv(a)nikhef.nl> Date: Mon Sep 8 18:17:51 2008 +0200 Fixed bug. G() ignored the imaginary parts of the arguments. ----------------------------------------------------------------------- Summary of changes: ginac/inifcns_nstdsums.cpp | 52 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 42 insertions(+), 10 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-80-gbb6b3d8
by git＠ginac.de 08 Sep '08

08 Sep '08

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 bb6b3d82cdf9e7ff4ecac89c47e63024e39ec96b (commit) via ccec535ede5a414447d69fba95af194df7327bfb (commit) via dacdde924c6d2e43ec52c2d6310d208d8e4024f6 (commit) from 55af76071727bd6e2fd540ad58eac26dd961f9c9 (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 bb6b3d82cdf9e7ff4ecac89c47e63024e39ec96b Author: Jens Vollinga <jensv(a)nikhef.nl> Date: Mon Sep 8 19:17:56 2008 +0200 Fixed bug in unvariate factorization. Bound for lifting was using a ordinary int instead of a cl_I. commit ccec535ede5a414447d69fba95af194df7327bfb Author: Jens Vollinga <jensv(a)nikhef.nl> Date: Mon Sep 8 18:32:27 2008 +0200 Added missing code for multivariate factorization. commit dacdde924c6d2e43ec52c2d6310d208d8e4024f6 Author: Jens Vollinga <jensv(a)nikhef.nl> Date: Mon Sep 8 18:17:51 2008 +0200 Fixed bug. G() ignored the imaginary parts of the arguments. ----------------------------------------------------------------------- Summary of changes: check/exam_factor.cpp | 7 + ginac/factor.cpp | 392 +++++++++++++++++++++++++++++++++++++++++++- ginac/inifcns_nstdsums.cpp | 52 +++++- 3 files changed, 432 insertions(+), 19 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-77-g55af760
by git＠ginac.de 27 Aug '08

27 Aug '08

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 55af76071727bd6e2fd540ad58eac26dd961f9c9 (commit) via a79a813e7249f793859d1d3b443d1931dbab94b6 (commit) via 6ff92476a4dcd32f9a0c6f59c95c74812ea86fef (commit) via 55e50ea26252dff7432bdce8b010f9fbd058e907 (commit) via 1d09676118944532e6100c93383d1659b1253a60 (commit) via adb1dbd383ae6e5a999b5f8cba72a5c2bfd50c11 (commit) via c77689e7ac8d8f4dbca0f337b6e9acf2419010ff (commit) via 77b6a0304a48d6a306deeda18177680f16025b33 (commit) via 7d7131d3af3de5425b7fe80b1f587740294371bc (commit) via b65fcd7481a401ec23c284c91f6f4e883e967676 (commit) via 8474043d373a19e04008f476fa9b77e45734b604 (commit) via ff09c4f8103f53fe3b7a51eb3c33eff2e5a243f0 (commit) via b4b302fe5d54720b58a23568a4270e04ee1ca216 (commit) from 1222eac51cee964961d2aad889dc4ceccb144a36 (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 55af76071727bd6e2fd540ad58eac26dd961f9c9 Author: Jens Vollinga <jensv(a)nikhef.nl> Date: Wed Aug 27 17:25:16 2008 +0200 Added internal code for multivariate factorization. commit a79a813e7249f793859d1d3b443d1931dbab94b6 Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Mon Aug 25 16:57:38 2008 +0400 gcd_pf_pow_pow: deobfuscate a little bit (no functional changes). Use if (foo) return bar(); return baz(); instead of if (foo) { return bar(); } else { return baz(); } This makes the code a little bit more readable. commit 6ff92476a4dcd32f9a0c6f59c95c74812ea86fef Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Mon Aug 25 16:57:02 2008 +0400 gcd_pf_pow: get rid of duplicate code. This function (which helps gcd() handle partially factored expressions) contained two copies of the same code. Remove one redundant copy. commit 55e50ea26252dff7432bdce8b010f9fbd058e907 Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Mon Aug 25 16:56:04 2008 +0400 introduce gcd_pf_pow_pow: gcd helper to handle partially factored expressions. gcd_pf_pow_pow handles the case when both arguments of gcd() are powers. N.B. the actual code moved from gcd_pf_pow, no functional changes. commit 1d09676118944532e6100c93383d1659b1253a60 Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Mon Aug 25 16:55:42 2008 +0400 gcd_pf_{pow, mul}: don't check if the arguments are polynomials. These functions gets called only from gcd(), which does this check on its own. commit adb1dbd383ae6e5a999b5f8cba72a5c2bfd50c11 Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Mon Aug 25 16:55:13 2008 +0400 gcd_pf_mul: get rid of duplicate code. This function (which helps gcd() handle partially factored expressions) contained two copies of the same code. Remove one redundant copy. commit c77689e7ac8d8f4dbca0f337b6e9acf2419010ff Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Mon Aug 25 16:54:46 2008 +0400 gcd(): allow user to override (some of) heuristics. GiNaC tries to avoid expanding expressions while computing GCDs and applies a number of heuristics. Usually this improves performance, but in some cases it doesn't. Allow user to switch off heuristics. Part 5: * gcd(): don't use heuristic GCD algorithm if gcd_options::no_heur_gcd flag is set. * gcd(): don't handle partially factored expressions in a special way if gcd_options::no_part_factored flag is set. commit 77b6a0304a48d6a306deeda18177680f16025b33 Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Mon Aug 25 16:54:10 2008 +0400 refactor gcd() a little bit (no functional changes). GiNaC tries to avoid expanding expressions while computing GCDs and applies a number of heuristics. Usually this improves performance, but in some cases it doesn't. Allow user to switch off heuristics. Part 4: refactor gcd() a little bit, so subsequent patch(es) won't be so big and ugly. commit 7d7131d3af3de5425b7fe80b1f587740294371bc Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Mon Aug 25 16:53:47 2008 +0400 introduce gcd_pf_mul: gcd helper to handle partially factored expressions. GiNaC tries to avoid expanding expressions while computing GCDs and applies a number of heuristics. Usually this improves performance, but in some cases it doesn't. Allow user to switch off heuristics. Part 3: Move the code handling products from gcd() into a separate function. This is *really* only code move, everything else should be considered a bug. commit b65fcd7481a401ec23c284c91f6f4e883e967676 Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Mon Aug 25 16:53:07 2008 +0400 introduce gcd_pf_pow: gcd helper to handle partially factored expressions. GiNaC tries to avoid expanding expressions while computing GCDs and applies a number of heuristics. Usually this improves performance, but in some cases it doesn't. Allow user to switch off heuristics. Part 2: Move the code handling powers from gcd() into a separate function. This is *really* only code move, everything else should be considered a bug. commit 8474043d373a19e04008f476fa9b77e45734b604 Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Mon Aug 25 16:52:45 2008 +0400 gcd: allow user to override (some of) heuristics. GiNaC tries to avoid expanding expressions while computing GCDs and applies a number of heuristics. Usually this improves performance, but in some cases it doesn't. Allow user to switch off heuristics. Part 1: * add new (optional) argument to gcd() to control its behaviour. * introduce gcd_options structure. N.B. No actual code changes so far, the actual handling of newly introduced options is the subject of further patches. commit ff09c4f8103f53fe3b7a51eb3c33eff2e5a243f0 Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Sun Aug 24 15:25:24 2008 +0400 inifscn_nstdsums: make functions handling Li/G transformations reentrant. Explicitly pass the dummy symbols instead of using a global variable. As a side effect, the code is more clear now (that's a bit subjective, but anyway). commit b4b302fe5d54720b58a23568a4270e04ee1ca216 Author: Alexei Sheplyakov <varg(a)theor.jinr.ru> Date: Fri Aug 22 02:42:17 2008 +0400 Bail out if both autogen and autogen'erated file(s) are missing. This makes the error message(s) more helpful. ----------------------------------------------------------------------- Summary of changes: ginac/Makefile.am | 1 + ginac/factor.cpp | 657 +++++++++++++++++++++++++++++++++++++++++++- ginac/inifcns_nstdsums.cpp | 128 +++++---- ginac/normal.cpp | 306 ++++++++++----------- ginac/normal.h | 25 ++- 5 files changed, 897 insertions(+), 220 deletions(-) hooks/post-receive -- GiNaC -- a C++ library for symbolic computations

1 0

[PATCH 10/10] gcd_pf_pow_pow: deobfuscate a little bit (no functional changes).
by Alexei Sheplyakov 25 Aug '08

25 Aug '08

Use if (foo) return bar(); return baz(); instead of if (foo) { return bar(); } else { return baz(); } This makes the code a little bit more readable. --- ginac/normal.cpp | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ginac/normal.cpp b/ginac/normal.cpp index 6392e3f..09773d3 100644 --- a/ginac/normal.cpp +++ b/ginac/normal.cpp @@ -1647,8 +1647,9 @@ static ex gcd_pf_pow_pow(const ex& a, const ex& b, ex* ca, ex* cb) const ex& exp_a = a.op(1); ex pb = b.op(0); const ex& exp_b = b.op(1); + + // a = p^n, b = p^m, gcd = p^min(n, m) if (p.is_equal(pb)) { - // a = p^n, b = p^m, gcd = p^min(n, m) if (exp_a < exp_b) { if (ca) *ca = _ex1; @@ -1662,31 +1663,30 @@ static ex gcd_pf_pow_pow(const ex& a, const ex& b, ex* ca, ex* cb) *cb = _ex1; return power(p, exp_b); } - } else { - ex p_co, pb_co; - ex p_gcd = gcd(p, pb, &p_co, &pb_co, false); - if (p_gcd.is_equal(_ex1)) { - // a(x) = p(x)^n, b(x) = p_b(x)^m, gcd (p, p_b) = 1 ==> - // gcd(a,b) = 1 + } + + ex p_co, pb_co; + ex p_gcd = gcd(p, pb, &p_co, &pb_co, false); + // a(x) = p(x)^n, b(x) = p_b(x)^m, gcd (p, p_b) = 1 ==> gcd(a,b) = 1 + if (p_gcd.is_equal(_ex1)) { if (ca) *ca = a; if (cb) *cb = b; return _ex1; // XXX: do I need to check for p_gcd = -1? - } else { - // there are common factors: - // a(x) = g(x)^n A(x)^n, b(x) = g(x)^m B(x)^m ==> - // gcd(a, b) = g(x)^n gcd(A(x)^n, g(x)^(n-m) B(x)^m - if (exp_a < exp_b) { - return power(p_gcd, exp_a)* - gcd(power(p_co, exp_a), power(p_gcd, exp_b-exp_a)*power(pb_co, exp_b), ca, cb, false); - } else { - return power(p_gcd, exp_b)* - gcd(power(p_gcd, exp_a - exp_b)*power(p_co, exp_a), power(pb_co, exp_b), ca, cb, false); - } - } // p_gcd.is_equal(_ex1) - } // p.is_equal(pb) + } + + // there are common factors: + // a(x) = g(x)^n A(x)^n, b(x) = g(x)^m B(x)^m ==> + // gcd(a, b) = g(x)^n gcd(A(x)^n, g(x)^(n-m) B(x)^m + if (exp_a < exp_b) { + ex pg = gcd(power(p_co, exp_a), power(p_gcd, exp_b-exp_a)*power(pb_co, exp_b), ca, cb, false); + return power(p_gcd, exp_a)*pg; + } else { + ex pg = gcd(power(p_gcd, exp_a - exp_b)*power(p_co, exp_a), power(pb_co, exp_b), ca, cb, false); + return power(p_gcd, exp_b)*pg; + } } static ex gcd_pf_pow(const ex& a, const ex& b, ex* ca, ex* cb) -- 1.5.6 Best regards, Alexei -- All science is either physics or stamp collecting.

1 0

[PATCH 09/10] gcd_pf_pow: get rid of duplicate code.
by Alexei Sheplyakov 25 Aug '08

25 Aug '08

This function (which helps gcd() handle partially factored expressions) contained two copies of the same code. Remove one redundant copy. --- ginac/normal.cpp | 80 ++++++++++++++++++----------------------------------- 1 files changed, 27 insertions(+), 53 deletions(-) diff --git a/ginac/normal.cpp b/ginac/normal.cpp index d5319b9..6392e3f 100644 --- a/ginac/normal.cpp +++ b/ginac/normal.cpp @@ -1691,65 +1691,39 @@ static ex gcd_pf_pow_pow(const ex& a, const ex& b, ex* ca, ex* cb) static ex gcd_pf_pow(const ex& a, const ex& b, ex* ca, ex* cb) { - if (is_exactly_a<power>(a)) { - ex p = a.op(0); - const ex& exp_a = a.op(1); - if (is_exactly_a<power>(b)) - return gcd_pf_pow_pow(a, b, ca, cb); - else { - if (p.is_equal(b)) { - // a = p^n, b = p, gcd = p - if (ca) - *ca = power(p, a.op(1) - 1); - if (cb) - *cb = _ex1; - return p; - } + if (is_exactly_a<power>(a) && is_exactly_a<power>(b)) + return gcd_pf_pow_pow(a, b, ca, cb); - ex p_co, bpart_co; - ex p_gcd = gcd(p, b, &p_co, &bpart_co, false); + if (is_exactly_a<power>(b) && (! is_exactly_a<power>(a))) + return gcd_pf_pow(b, a, cb, ca); - if (p_gcd.is_equal(_ex1)) { - // a(x) = p(x)^n, gcd(p, b) = 1 ==> gcd(a, b) = 1 - if (ca) - *ca = a; - if (cb) - *cb = b; - return _ex1; - } else { - // a(x) = g(x)^n A(x)^n, b(x) = g(x) B(x) ==> gcd(a, b) = g(x) gcd(g(x)^(n-1) A(x)^n, B(x)) - return p_gcd*gcd(power(p_gcd, exp_a-1)*power(p_co, exp_a), bpart_co, ca, cb, false); - } - } // is_exactly_a<power>(b) + GINAC_ASSERT(is_exactly_a<power>(a)); - } else if (is_exactly_a<power>(b)) { - ex p = b.op(0); - if (p.is_equal(a)) { - // a = p, b = p^n, gcd = p - if (ca) - *ca = _ex1; - if (cb) - *cb = power(p, b.op(1) - 1); - return p; - } + ex p = a.op(0); + const ex& exp_a = a.op(1); + if (p.is_equal(b)) { + // a = p^n, b = p, gcd = p + if (ca) + *ca = power(p, a.op(1) - 1); + if (cb) + *cb = _ex1; + return p; + } - ex p_co, apart_co; - const ex& exp_b(b.op(1)); - ex p_gcd = gcd(a, p, &apart_co, &p_co, false); - if (p_gcd.is_equal(_ex1)) { - // b=p(x)^n, gcd(a, p) = 1 ==> gcd(a, b) == 1 - if (ca) - *ca = a; - if (cb) - *cb = b; - return _ex1; - } else { - // there are common factors: - // a(x) = g(x) A(x), b(x) = g(x)^n B(x)^n ==> gcd = g(x) gcd(g(x)^(n-1) A(x)^n, B(x)) + ex p_co, bpart_co; + ex p_gcd = gcd(p, b, &p_co, &bpart_co, false); - return p_gcd*gcd(apart_co, power(p_gcd, exp_b-1)*power(p_co, exp_b), ca, cb, false); - } // p_gcd.is_equal(_ex1) + // a(x) = p(x)^n, gcd(p, b) = 1 ==> gcd(a, b) = 1 + if (p_gcd.is_equal(_ex1)) { + if (ca) + *ca = a; + if (cb) + *cb = b; + return _ex1; } + // a(x) = g(x)^n A(x)^n, b(x) = g(x) B(x) ==> gcd(a, b) = g(x) gcd(g(x)^(n-1) A(x)^n, B(x)) + ex rg = gcd(power(p_gcd, exp_a-1)*power(p_co, exp_a), bpart_co, ca, cb, false); + return p_gcd*rg; } static ex gcd_pf_mul(const ex& a, const ex& b, ex* ca, ex* cb) -- 1.5.6 Best regards, Alexei -- All science is either physics or stamp collecting.

1 0

[PATCH 08/10] introduce gcd_pf_pow_pow: gcd helper to handle partially factored expressions.
by Alexei Sheplyakov 25 Aug '08

25 Aug '08

gcd_pf_pow_pow handles the case when both arguments of gcd() are powers. N.B. the actual code moved from gcd_pf_pow, no functional changes. --- ginac/normal.cpp | 98 +++++++++++++++++++++++++++++------------------------- 1 files changed, 53 insertions(+), 45 deletions(-) diff --git a/ginac/normal.cpp b/ginac/normal.cpp index e97a7ce..d5319b9 100644 --- a/ginac/normal.cpp +++ b/ginac/normal.cpp @@ -1639,56 +1639,64 @@ ex gcd(const ex &a, const ex &b, ex *ca, ex *cb, bool check_args, unsigned optio return g; } +// gcd helper to handle partially factored polynomials (to avoid expanding +// large expressions). Both arguments should be powers. +static ex gcd_pf_pow_pow(const ex& a, const ex& b, ex* ca, ex* cb) +{ + ex p = a.op(0); + const ex& exp_a = a.op(1); + ex pb = b.op(0); + const ex& exp_b = b.op(1); + if (p.is_equal(pb)) { + // a = p^n, b = p^m, gcd = p^min(n, m) + if (exp_a < exp_b) { + if (ca) + *ca = _ex1; + if (cb) + *cb = power(p, exp_b - exp_a); + return power(p, exp_a); + } else { + if (ca) + *ca = power(p, exp_a - exp_b); + if (cb) + *cb = _ex1; + return power(p, exp_b); + } + } else { + ex p_co, pb_co; + ex p_gcd = gcd(p, pb, &p_co, &pb_co, false); + if (p_gcd.is_equal(_ex1)) { + // a(x) = p(x)^n, b(x) = p_b(x)^m, gcd (p, p_b) = 1 ==> + // gcd(a,b) = 1 + if (ca) + *ca = a; + if (cb) + *cb = b; + return _ex1; + // XXX: do I need to check for p_gcd = -1? + } else { + // there are common factors: + // a(x) = g(x)^n A(x)^n, b(x) = g(x)^m B(x)^m ==> + // gcd(a, b) = g(x)^n gcd(A(x)^n, g(x)^(n-m) B(x)^m + if (exp_a < exp_b) { + return power(p_gcd, exp_a)* + gcd(power(p_co, exp_a), power(p_gcd, exp_b-exp_a)*power(pb_co, exp_b), ca, cb, false); + } else { + return power(p_gcd, exp_b)* + gcd(power(p_gcd, exp_a - exp_b)*power(p_co, exp_a), power(pb_co, exp_b), ca, cb, false); + } + } // p_gcd.is_equal(_ex1) + } // p.is_equal(pb) +} + static ex gcd_pf_pow(const ex& a, const ex& b, ex* ca, ex* cb) { if (is_exactly_a<power>(a)) { ex p = a.op(0); const ex& exp_a = a.op(1); - if (is_exactly_a<power>(b)) { - ex pb = b.op(0); - const ex& exp_b = b.op(1); - if (p.is_equal(pb)) { - // a = p^n, b = p^m, gcd = p^min(n, m) - if (exp_a < exp_b) { - if (ca) - *ca = _ex1; - if (cb) - *cb = power(p, exp_b - exp_a); - return power(p, exp_a); - } else { - if (ca) - *ca = power(p, exp_a - exp_b); - if (cb) - *cb = _ex1; - return power(p, exp_b); - } - } else { - ex p_co, pb_co; - ex p_gcd = gcd(p, pb, &p_co, &pb_co, false); - if (p_gcd.is_equal(_ex1)) { - // a(x) = p(x)^n, b(x) = p_b(x)^m, gcd (p, p_b) = 1 ==> - // gcd(a,b) = 1 - if (ca) - *ca = a; - if (cb) - *cb = b; - return _ex1; - // XXX: do I need to check for p_gcd = -1? - } else { - // there are common factors: - // a(x) = g(x)^n A(x)^n, b(x) = g(x)^m B(x)^m ==> - // gcd(a, b) = g(x)^n gcd(A(x)^n, g(x)^(n-m) B(x)^m - if (exp_a < exp_b) { - return power(p_gcd, exp_a)* - gcd(power(p_co, exp_a), power(p_gcd, exp_b-exp_a)*power(pb_co, exp_b), ca, cb, false); - } else { - return power(p_gcd, exp_b)* - gcd(power(p_gcd, exp_a - exp_b)*power(p_co, exp_a), power(pb_co, exp_b), ca, cb, false); - } - } // p_gcd.is_equal(_ex1) - } // p.is_equal(pb) - - } else { + if (is_exactly_a<power>(b)) + return gcd_pf_pow_pow(a, b, ca, cb); + else { if (p.is_equal(b)) { // a = p^n, b = p, gcd = p if (ca) -- 1.5.6 Best regards, Alexei -- All science is either physics or stamp collecting.

1 0

[PATCH 07/10] gcd_pf_{pow, mul}: don't check if the arguments are polynomials.
by Alexei Sheplyakov 25 Aug '08

25 Aug '08

These functions gets called only from gcd(), which does this check on its own. --- ginac/normal.cpp | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ginac/normal.cpp b/ginac/normal.cpp index 2bb3a43..e97a7ce 100644 --- a/ginac/normal.cpp +++ b/ginac/normal.cpp @@ -1417,11 +1417,11 @@ static bool heur_gcd(ex& res, const ex& a, const ex& b, ex *ca, ex *cb, // gcd helper to handle partially factored polynomials (to avoid expanding // large expressions). At least one of the arguments should be a power. -static ex gcd_pf_pow(const ex& a, const ex& b, ex* ca, ex* cb, bool check_args); +static ex gcd_pf_pow(const ex& a, const ex& b, ex* ca, ex* cb); // gcd helper to handle partially factored polynomials (to avoid expanding // large expressions). At least one of the arguments should be a product. -static ex gcd_pf_mul(const ex& a, const ex& b, ex* ca, ex* cb, bool check_args); +static ex gcd_pf_mul(const ex& a, const ex& b, ex* ca, ex* cb); /** Compute GCD (Greatest Common Divisor) of multivariate polynomials a(X) * and b(X) in Z[X]. Optionally also compute the cofactors of a and b, @@ -1467,10 +1467,10 @@ ex gcd(const ex &a, const ex &b, ex *ca, ex *cb, bool check_args, unsigned optio // Partially factored cases (to avoid expanding large expressions) if (!(options & gcd_options::no_part_factored)) { if (is_exactly_a<mul>(a) || is_exactly_a<mul>(b)) - return gcd_pf_mul(a, b, ca, cb, check_args); + return gcd_pf_mul(a, b, ca, cb); #if FAST_COMPARE if (is_exactly_a<power>(a) || is_exactly_a<power>(b)) - return gcd_pf_pow(a, b, ca, cb, check_args); + return gcd_pf_pow(a, b, ca, cb); #endif } @@ -1639,7 +1639,7 @@ ex gcd(const ex &a, const ex &b, ex *ca, ex *cb, bool check_args, unsigned optio return g; } -static ex gcd_pf_pow(const ex& a, const ex& b, ex* ca, ex* cb, bool check_args) +static ex gcd_pf_pow(const ex& a, const ex& b, ex* ca, ex* cb) { if (is_exactly_a<power>(a)) { ex p = a.op(0); @@ -1664,7 +1664,7 @@ static ex gcd_pf_pow(const ex& a, const ex& b, ex* ca, ex* cb, bool check_args) } } else { ex p_co, pb_co; - ex p_gcd = gcd(p, pb, &p_co, &pb_co, check_args); + ex p_gcd = gcd(p, pb, &p_co, &pb_co, false); if (p_gcd.is_equal(_ex1)) { // a(x) = p(x)^n, b(x) = p_b(x)^m, gcd (p, p_b) = 1 ==> // gcd(a,b) = 1 @@ -1744,14 +1744,14 @@ static ex gcd_pf_pow(const ex& a, const ex& b, ex* ca, ex* cb, bool check_args) } } -static ex gcd_pf_mul(const ex& a, const ex& b, ex* ca, ex* cb, bool check_args) +static ex gcd_pf_mul(const ex& a, const ex& b, ex* ca, ex* cb) { if (is_exactly_a<mul>(a) && is_exactly_a<mul>(b) && (b.nops() > a.nops())) - return gcd_pf_mul(b, a, cb, ca, check_args); + return gcd_pf_mul(b, a, cb, ca); if (is_exactly_a<mul>(b) && (!is_exactly_a<mul>(a))) - return gcd_pf_mul(b, a, cb, ca, check_args); + return gcd_pf_mul(b, a, cb, ca); GINAC_ASSERT(is_exactly_a<mul>(a)); size_t num = a.nops(); @@ -1760,7 +1760,7 @@ static ex gcd_pf_mul(const ex& a, const ex& b, ex* ca, ex* cb, bool check_args) ex part_b = b; for (size_t i=0; i<num; i++) { ex part_ca, part_cb; - g.push_back(gcd(a.op(i), part_b, &part_ca, &part_cb, check_args)); + g.push_back(gcd(a.op(i), part_b, &part_ca, &part_cb, false)); acc_ca.push_back(part_ca); part_b = part_cb; } -- 1.5.6 Best regards, Alexei -- All science is either physics or stamp collecting.

1 0