Janitorial commit.

Remove some assertions that have been wrong since a while, in particular since
8ba901b532b, when we started to factor numerical factors from power objects.

Fix some broken indentation. Fix some comment errors. Remove unused variable.

diff --git a/check/check_numeric.cpp b/check/check_numeric.cpp
index d11a9b2f77eb99bae9a850e5fe7df057ebb2b7bc..0442f514da44e735fa01b82c6ac86f59226e9275 100644 (file)
--- a/check/check_numeric.cpp
+++ b/check/check_numeric.cpp
@@ -115,7 +115,6 @@ unsigned check_numeric()
        unsigned result = 0;
        
        cout << "checking consistency of numeric types" << flush;
-       clog << "---------consistency of numeric types:" << endl;
        
        result += check_numeric1();  cout << '.' << flush;
        result += check_numeric2();  cout << '.' << flush;

diff --git a/ginac/add.cpp b/ginac/add.cpp
index eb965b6b77cd839e39b694ac1594232a680bd15d..41f2096e646f909f672581b0ea4b4f2d194b42e3 100644 (file)
--- a/ginac/add.cpp
+++ b/ginac/add.cpp
@@ -613,7 +613,7 @@ expair add::combine_pair_with_coeff_to_pair(const expair & p,
 
        return expair(p.rest,ex_to<numeric>(p.coeff).mul_dyn(ex_to<numeric>(c)));
 }
-       
+
 ex add::recombine_pair_to_ex(const expair & p) const
 {
        if (ex_to<numeric>(p.coeff).is_equal(*_num1_p))

diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp
index 2649b4b8b6c28d51089c00fe012ed48dbe028e72..ab14b555d1681d312bc6de93522dbbfb6e46aea7 100644 (file)
--- a/ginac/expairseq.cpp
+++ b/ginac/expairseq.cpp
@@ -873,7 +873,7 @@ void expairseq::construct_from_2_ex(const ex &lh, const ex &rh)
 }
 
 void expairseq::construct_from_2_expairseq(const expairseq &s1,
-                                                                                  const expairseq &s2)
+                                           const expairseq &s2)
 {
        combine_overall_coeff(s1.overall_coeff);
        combine_overall_coeff(s2.overall_coeff);
@@ -928,7 +928,7 @@ void expairseq::construct_from_2_expairseq(const expairseq &s1,
 }
 
 void expairseq::construct_from_expairseq_ex(const expairseq &s,
-                                                                                       const ex &e)
+                                            const ex &e)
 {
        combine_overall_coeff(s.overall_coeff);
        if (is_exactly_a<numeric>(e)) {
@@ -993,7 +993,7 @@ void expairseq::construct_from_exvector(const exvector &v)
 {
        // simplifications: +(a,+(b,c),d) -> +(a,b,c,d) (associativity)
        //                  +(d,b,c,a) -> +(a,b,c,d) (canonicalization)
-       //                  +(...,x,*(x,c1),*(x,c2)) -> +(...,*(x,1+c1+c2)) (c1, c2 numeric())
+       //                  +(...,x,*(x,c1),*(x,c2)) -> +(...,*(x,1+c1+c2)) (c1, c2 numeric)
        //                  (same for (+,*) -> (*,^)
 
        make_flat(v);
@@ -1009,8 +1009,8 @@ void expairseq::construct_from_epvector(const epvector &v, bool do_index_renamin
 {
        // simplifications: +(a,+(b,c),d) -> +(a,b,c,d) (associativity)
        //                  +(d,b,c,a) -> +(a,b,c,d) (canonicalization)
-       //                  +(...,x,*(x,c1),*(x,c2)) -> +(...,*(x,1+c1+c2)) (c1, c2 numeric())
-       //                  (same for (+,*) -> (*,^)
+       //                  +(...,x,*(x,c1),*(x,c2)) -> +(...,*(x,1+c1+c2)) (c1, c2 numeric)
+       //                  same for (+,*) -> (*,^)
 
        make_flat(v, do_index_renaming);
 #if EXPAIRSEQ_USE_HASHTAB
@@ -1432,7 +1432,7 @@ bool expairseq::has_coeff_0() const
 }
 
 void expairseq::add_numerics_to_hashtab(epvector::iterator first_numeric,
-                                                                               epvector::const_iterator last_non_zero)
+                                        epvector::const_iterator last_non_zero)
 {
        if (first_numeric == seq.end()) return; // no numerics
        

diff --git a/ginac/factor.cpp b/ginac/factor.cpp
index 2f98f9db5d0ee442ad54ad03fe6b8b18bf503bd6..945b25e653a4c56ba59b1ec3abeac50f34a065f8 100644 (file)
--- a/ginac/factor.cpp
+++ b/ginac/factor.cpp
@@ -737,7 +737,6 @@ public:
        }
        bool is_col_zero(size_t col) const
        {
-               mvec::const_iterator i = m.begin() + col;
                for ( size_t rr=0; rr<r; ++rr ) {
                        std::size_t i = col + rr*c;
                        if ( !zerop(m[i]) ) {

diff --git a/ginac/mul.cpp b/ginac/mul.cpp
index 27add930cf56863ae7d635d3031e4dc2b1d7ea9f..763e6037abacefd0719ecdd9fd5ec6d0799abb53 100644 (file)
--- a/ginac/mul.cpp
+++ b/ginac/mul.cpp
@@ -448,24 +448,6 @@ ex mul::eval(int level) const
                           setflag(status_flags::dynallocated);
        }
        
-#ifdef DO_GINAC_ASSERT
-       epvector::const_iterator i = seq.begin(), end = seq.end();
-       while (i != end) {
-               GINAC_ASSERT((!is_exactly_a<mul>(i->rest)) ||
-                            (!(ex_to<numeric>(i->coeff).is_integer())));
-               GINAC_ASSERT(!(i->is_canonical_numeric()));
-               if (is_exactly_a<numeric>(recombine_pair_to_ex(*i)))
-                   print(print_tree(std::cerr));
-               GINAC_ASSERT(!is_exactly_a<numeric>(recombine_pair_to_ex(*i)));
-               /* for paranoia */
-               expair p = split_ex_to_pair(recombine_pair_to_ex(*i));
-               GINAC_ASSERT(p.rest.is_equal(i->rest));
-               GINAC_ASSERT(p.coeff.is_equal(i->coeff));
-               /* end paranoia */
-               ++i;
-       }
-#endif // def DO_GINAC_ASSERT
-       
        if (flags & status_flags::evaluated) {
                GINAC_ASSERT(seq.size()>0);
                GINAC_ASSERT(seq.size()>1 || !overall_coeff.is_equal(_ex1));
@@ -500,7 +482,7 @@ ex mul::eval(int level) const
                       )->setflag(status_flags::dynallocated | status_flags::evaluated);
        } else if ((seq_size >= 2) && (! (flags & status_flags::expanded))) {
                // Strip the content and the unit part from each term. Thus
-               // things like (-x+a)*(3*x-3*a) automagically turn into - 3*(x-a)2
+               // things like (-x+a)*(3*x-3*a) automagically turn into - 3*(x-a)^2
 
                epvector::const_iterator last = seq.end();
                epvector::const_iterator i = seq.begin();
@@ -552,8 +534,7 @@ ex mul::eval(int level) const
                        primitive->setflag(status_flags::dynallocated);
                        primitive->clearflag(status_flags::hash_calculated);
                        primitive->overall_coeff = ex_to<numeric>(primitive->overall_coeff).div_dyn(c);
-                       for (epvector::iterator ai = primitive->seq.begin();
-                                       ai != primitive->seq.end(); ++ai)
+                       for (epvector::iterator ai = primitive->seq.begin(); ai != primitive->seq.end(); ++ai)
                                ai->coeff = ex_to<numeric>(ai->coeff).div_dyn(c);
                        
                        s->push_back(expair(*primitive, _ex1));
@@ -737,8 +718,8 @@ bool tryfactsubs(const ex & origfactor, const ex & patternfactor, int & nummatch
   * is true for factors that have been matched by the current match.
   */
 bool algebraic_match_mul_with_mul(const mul &e, const ex &pat, exmap& repls,
-               int factor, int &nummatches, const std::vector<bool> &subsed,
-               std::vector<bool> &matched)
+                                  int factor, int &nummatches, const std::vector<bool> &subsed,
+                                  std::vector<bool> &matched)
 {
        GINAC_ASSERT(subsed.size() == e.nops());
        GINAC_ASSERT(matched.size() == e.nops());
@@ -936,7 +917,7 @@ unsigned mul::return_type() const
        // all factors checked
        return all_commutative ? return_types::commutative : return_types::noncommutative;
 }
-   
+
 return_type_t mul::return_type_tinfo() const
 {
        if (seq.empty())
@@ -972,7 +953,7 @@ expair mul::split_ex_to_pair(const ex & e) const
        }
        return expair(e,_ex1);
 }
-       
+
 expair mul::combine_ex_with_coeff_to_pair(const ex & e,
                                           const ex & c) const
 {
@@ -985,7 +966,7 @@ expair mul::combine_ex_with_coeff_to_pair(const ex & e,
 
        return split_ex_to_pair(power(e,c));
 }
-       
+
 expair mul::combine_pair_with_coeff_to_pair(const expair & p,
                                             const ex & c) const
 {
@@ -998,7 +979,7 @@ expair mul::combine_pair_with_coeff_to_pair(const expair & p,
 
        return split_ex_to_pair(power(recombine_pair_to_ex(p),c));
 }
-       
+
 ex mul::recombine_pair_to_ex(const expair & p) const
 {
        if (ex_to<numeric>(p.coeff).is_equal(*_num1_p)) 
@@ -1010,22 +991,22 @@ ex mul::recombine_pair_to_ex(const expair & p) const
 bool mul::expair_needs_further_processing(epp it)
 {
        if (is_exactly_a<mul>(it->rest) &&
-               ex_to<numeric>(it->coeff).is_integer()) {
+           ex_to<numeric>(it->coeff).is_integer()) {
                // combined pair is product with integer power -> expand it
                *it = split_ex_to_pair(recombine_pair_to_ex(*it));
                return true;
        }
        if (is_exactly_a<numeric>(it->rest)) {
+               if (it->coeff.is_equal(_ex1)) {
+                       // pair has coeff 1 and must be moved to the end
+                       return true;
+               }
                expair ep = split_ex_to_pair(recombine_pair_to_ex(*it));
                if (!ep.is_equal(*it)) {
                        // combined pair is a numeric power which can be simplified
                        *it = ep;
                        return true;
                }
-               if (it->coeff.is_equal(_ex1)) {
-                       // combined pair has coeff 1 and must be moved to the end
-                       return true;
-               }
        }
        return false;
 }       

diff --git a/ginac/power.cpp b/ginac/power.cpp
index d8c9b4efc9d4f692d5a725627532a26a9da0e3f2..9a8f7d5697f46ff00525de25aab94767ab841aaf 100644 (file)
--- a/ginac/power.cpp
+++ b/ginac/power.cpp
@@ -735,8 +735,7 @@ ex power::imag_part() const
        ex b=basis.imag_part();
        ex c=exponent.real_part();
        ex d=exponent.imag_part();
-       return
-               power(abs(basis),c)*exp(-d*atan2(b,a))*sin(c*atan2(b,a)+d*log(abs(basis)));
+       return power(abs(basis),c)*exp(-d*atan2(b,a))*sin(c*atan2(b,a)+d*log(abs(basis)));
 }
 
 // protected