X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=check%2Fgenex.cpp;h=c79b81fb60dd1d08fc26a8a578dfdf2561c79f9f;hb=ac0ef893e48af99dc632adcdf21edd6a402327b3;hp=940e6ec6db8dbc6841fabff72c7f7f0671aaa43b;hpb=1f5afe37b4c079821de9810435fa9fa11e4ea17b;p=ginac.git diff --git a/check/genex.cpp b/check/genex.cpp index 940e6ec6..c79b81fb 100644 --- a/check/genex.cpp +++ b/check/genex.cpp @@ -4,7 +4,7 @@ * input in the consistency checks. */ /* - * GiNaC Copyright (C) 1999-2003 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 @@ -18,14 +18,15 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include #include "ginac.h" -using namespace std; using namespace GiNaC; +#include +using namespace std; + /* Create a dense univariate random polynomial in x. * (of the form 9 - 22*a - 17*a^2 + 14*a^3 + 7*a^4 + 7a^5 if degree==5) */ const ex @@ -54,13 +55,13 @@ dense_bivariate_poly(const symbol & x1, const symbol & x2, unsigned degree) return bipoly; } -/* Chose a randum symbol or number from the argument list. */ +/* Chose a random symbol or number from the argument list. */ const ex random_symbol(const symbol & x, - const symbol & y, - const symbol & z, - bool rational = true, - bool complex = false) + const symbol & y, + const symbol & z, + bool rational = true, + bool complex = false) { ex e; switch (abs(rand()) % 4) { @@ -92,12 +93,12 @@ random_symbol(const symbol & x, /* Create a sparse random tree in three symbols. */ const ex sparse_tree(const symbol & x, - const symbol & y, - const symbol & z, - int level, - bool trig = false, // true includes trigonomatric functions - bool rational = true, // false excludes coefficients in Q - bool complex = false) // true includes complex numbers + const symbol & y, + const symbol & z, + int level, + bool trig = false, // true includes trigonometric functions + bool rational = true, // false excludes coefficients in Q + bool complex = false) // true includes complex numbers { if (level == 0) return random_symbol(x,y,z,rational,complex); @@ -151,4 +152,6 @@ sparse_tree(const symbol & x, } else return random_symbol(x,y,z,rational,complex); } + + return 0; }