Add some minor optimizations.

diff --git a/ginac/add.cpp b/ginac/add.cpp
index 74c8d815ca1a6fe0fd197138a86b18c0f8ab8232..fd83de1134876f448835f9e48722f990c04402a5 100644 (file)
--- a/ginac/add.cpp
+++ b/ginac/add.cpp
@@ -331,7 +331,7 @@ ex add::coeff(const ex & s, int n) const
 ex add::eval(int level) const
 {
        epvector evaled = evalchildren(level);
 ex add::eval(int level) const
 {
        epvector evaled = evalchildren(level);

-       if (!evaled.empty()) {
+       if (unlikely(!evaled.empty())) {

                // do more evaluation later
                return (new add(std::move(evaled), overall_coeff))->
                        setflag(status_flags::dynallocated);
                // do more evaluation later
                return (new add(std::move(evaled), overall_coeff))->
                        setflag(status_flags::dynallocated);

diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp
index 67099f5796395e7d012fb1d4a13484278675e800..0e67ec9a4e60733293d51db65c3e13f1d1751ade 100644 (file)
--- a/ginac/expairseq.cpp
+++ b/ginac/expairseq.cpp
@@ -32,6 +32,7 @@
 #include "utils.h"
 #include "hash_seed.h"
 #include "indexed.h"
 #include "utils.h"
 #include "hash_seed.h"
 #include "indexed.h"

+#include "compiler.h"

 
 #include <algorithm>
 #include <iostream>
 
 #include <algorithm>
 #include <iostream>


@@ -1053,7 +1054,7 @@ epvector expairseq::expandchildren(unsigned options) const
  *    had to be changed. */
 epvector expairseq::evalchildren(int level) const
 {
  *    had to be changed. */
 epvector expairseq::evalchildren(int level) const
 {

-       if (level==1)
+       if (likely(level==1))

                return epvector();  // nothing had to be evaluated
        
        if (level == -max_recursion_level)
                return epvector();  // nothing had to be evaluated
        
        if (level == -max_recursion_level)

diff --git a/ginac/mul.cpp b/ginac/mul.cpp
index 943095bb3a9c0e1a88aa023c37916bc701178eae..f8ddd9b2eb8ce2a86a84aecf7547ed7696a7a87b 100644 (file)
--- a/ginac/mul.cpp
+++ b/ginac/mul.cpp
@@ -469,7 +469,7 @@ ex mul::coeff(const ex & s, int n) const
 ex mul::eval(int level) const
 {
        epvector evaled = evalchildren(level);
 ex mul::eval(int level) const
 {
        epvector evaled = evalchildren(level);

-       if (!evaled.empty()) {
+       if (unlikely(!evaled.empty())) {

                // do more evaluation later
                return (new mul(std::move(evaled), overall_coeff))->
                        setflag(status_flags::dynallocated);
                // do more evaluation later
                return (new mul(std::move(evaled), overall_coeff))->
                        setflag(status_flags::dynallocated);

diff --git a/ginac/power.cpp b/ginac/power.cpp
index b2622d60e932410997b625bc8ac79e5be4e6541b..485fa06fa7b21e4eb280a4d9176122844f30675f 100644 (file)
--- a/ginac/power.cpp
+++ b/ginac/power.cpp
@@ -1207,7 +1207,6 @@ ex power::expand_add(const add & a, int n, unsigned options) const
                                numeric factor = coeff;
                                for (unsigned i = 0; i < exponent.size(); ++i) {
                                        const ex & r = a.seq[i].rest;
                                numeric factor = coeff;
                                for (unsigned i = 0; i < exponent.size(); ++i) {
                                        const ex & r = a.seq[i].rest;

-                                       const ex & c = a.seq[i].coeff;

                                        GINAC_ASSERT(!is_exactly_a<add>(r));
                                        GINAC_ASSERT(!is_exactly_a<power>(r) ||
                                                     !is_exactly_a<numeric>(ex_to<power>(r).exponent) ||
                                        GINAC_ASSERT(!is_exactly_a<add>(r));
                                        GINAC_ASSERT(!is_exactly_a<power>(r) ||
                                                     !is_exactly_a<numeric>(ex_to<power>(r).exponent) ||


@@ -1215,15 +1214,19 @@ ex power::expand_add(const add & a, int n, unsigned options) const
                                                     !is_exactly_a<add>(ex_to<power>(r).basis) ||
                                                     !is_exactly_a<mul>(ex_to<power>(r).basis) ||
                                                     !is_exactly_a<power>(ex_to<power>(r).basis));
                                                     !is_exactly_a<add>(ex_to<power>(r).basis) ||
                                                     !is_exactly_a<mul>(ex_to<power>(r).basis) ||
                                                     !is_exactly_a<power>(ex_to<power>(r).basis));

+                                       GINAC_ASSERT(is_exactly_a<numeric>(a.seq[i].coeff));
+                                       const numeric & c = ex_to<numeric>(a.seq[i].coeff);

                                        if (exponent[i] == 0) {
                                                // optimize away
                                        } else if (exponent[i] == 1) {
                                                // optimized
                                                term.push_back(r);
                                        if (exponent[i] == 0) {
                                                // optimize away
                                        } else if (exponent[i] == 1) {
                                                // optimized
                                                term.push_back(r);

-                                               factor = factor.mul(ex_to<numeric>(c));
+                                               if (c != *_num1_p)
+                                                       factor = factor.mul(c);

                                        } else { // general case exponent[i] > 1
                                                term.push_back((new power(r, exponent[i]))->setflag(status_flags::dynallocated));
                                        } else { // general case exponent[i] > 1
                                                term.push_back((new power(r, exponent[i]))->setflag(status_flags::dynallocated));

-                                               factor = factor.mul(ex_to<numeric>(c).power(exponent[i]));
+                                               if (c != *_num1_p)
+                                                       factor = factor.mul(c.power(exponent[i]));

                                        }
                                }
                                result.push_back(a.combine_ex_with_coeff_to_pair(mul(term).expand(options), factor));
                                        }
                                }
                                result.push_back(a.combine_ex_with_coeff_to_pair(mul(term).expand(options), factor));