- See if __GNUC__ < 2.97 before using std::vector<..,malloc_alloc>. Sorry,

[ginac.git] / ginac / normal.cpp

diff --git a/ginac/normal.cpp b/ginac/normal.cpp
index 851b7ba7f035ac9f595e0ee37e11c266e2060d01..69a6945283159a5a5d0006f20928fdb0ba180ef4 100644 (file)
--- a/ginac/normal.cpp
+++ b/ginac/normal.cpp
@@ -6,7 +6,7 @@
  *  computation, square-free factorization and rational function normalization. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -196,7 +196,7 @@ static void get_symbol_stats(const ex &a, const ex &b, sym_desc_vec &v)
                int deg_b = b.degree(*(it->sym));
                it->deg_a = deg_a;
                it->deg_b = deg_b;
-               it->max_deg = max(deg_a, deg_b);
+               it->max_deg = std::max(deg_a,deg_b);
                it->ldeg_a = a.ldegree(*(it->sym));
                it->ldeg_b = b.ldegree(*(it->sym));
                it++;
@@ -569,7 +569,7 @@ bool divide(const ex &a, const ex &b, ex &q, bool check_args)
        }
 #endif
        if (check_args && (!a.info(info_flags::rational_polynomial) ||
-                                          !b.info(info_flags::rational_polynomial)))
+                          !b.info(info_flags::rational_polynomial)))
                throw(std::invalid_argument("divide: arguments must be polynomials over the rationals"));
 
        // Find first symbol
@@ -1353,10 +1353,11 @@ static ex heur_gcd(const ex &a, const ex &b, ex *ca, ex *cb, sym_desc_vec::const
        numeric rgc = gc.inverse();
        ex p = a * rgc;
        ex q = b * rgc;
-       int maxdeg = max(p.degree(x), q.degree(x));
-
+       int maxdeg =  std::max(p.degree(x),q.degree(x));
+       
        // Find evaluation point
-       numeric mp = p.max_coefficient(), mq = q.max_coefficient();
+       numeric mp = p.max_coefficient();
+       numeric mq = q.max_coefficient();
        numeric xi;
        if (mp > mq)
                xi = mq * _num2() + _num2();
@@ -1595,7 +1596,7 @@ factored_b:
        // Cancel trivial common factor
        int ldeg_a = var->ldeg_a;
        int ldeg_b = var->ldeg_b;
-       int min_ldeg = min(ldeg_a, ldeg_b);
+       int min_ldeg = std::min(ldeg_a,ldeg_b);
        if (min_ldeg > 0) {
                ex common = power(x, min_ldeg);
 //std::clog << "trivial common factor " << common << endl;
@@ -1890,7 +1891,7 @@ static ex frac_cancel(const ex &n, const ex &d)
        // as defined by get_first_symbol() is made positive)
        const symbol *x;
        if (get_first_symbol(den, x)) {
-                               GINAC_ASSERT(is_ex_exactly_of_type(den.unit(*x),numeric));
+               GINAC_ASSERT(is_ex_exactly_of_type(den.unit(*x),numeric));
                if (ex_to_numeric(den.unit(*x)).is_negative()) {
                        num *= _ex_1();
                        den *= _ex_1();
@@ -1909,7 +1910,7 @@ static ex frac_cancel(const ex &n, const ex &d)
 ex add::normal(lst &sym_lst, lst &repl_lst, int level) const
 {
        if (level == 1)
-               return (new lst(*this, _ex1()))->setflag(status_flags::dynallocated);
+               return (new lst(replace_with_symbol(*this, sym_lst, repl_lst), _ex1()))->setflag(status_flags::dynallocated);
        else if (level == -max_recursion_level)
                throw(std::runtime_error("max recursion level reached"));
 
@@ -1990,7 +1991,7 @@ ex add::normal(lst &sym_lst, lst &repl_lst, int level) const
 ex mul::normal(lst &sym_lst, lst &repl_lst, int level) const
 {
        if (level == 1)
-               return (new lst(*this, _ex1()))->setflag(status_flags::dynallocated);
+               return (new lst(replace_with_symbol(*this, sym_lst, repl_lst), _ex1()))->setflag(status_flags::dynallocated);
        else if (level == -max_recursion_level)
                throw(std::runtime_error("max recursion level reached"));
 
@@ -2021,7 +2022,7 @@ ex mul::normal(lst &sym_lst, lst &repl_lst, int level) const
 ex power::normal(lst &sym_lst, lst &repl_lst, int level) const
 {
        if (level == 1)
-               return (new lst(*this, _ex1()))->setflag(status_flags::dynallocated);
+               return (new lst(replace_with_symbol(*this, sym_lst, repl_lst), _ex1()))->setflag(status_flags::dynallocated);
        else if (level == -max_recursion_level)
                throw(std::runtime_error("max recursion level reached"));