subs_no_pattern -> no_pattern, subs_algebraic -> algebraic

[ginac.git] / ginac / mul.cpp

diff --git a/ginac/mul.cpp b/ginac/mul.cpp
index 2c8456510a44d35201f5659dec50f27f32206e02..9d2aac1518dfc795e3c440b630884dec8bcad9c6 100644 (file)
--- a/ginac/mul.cpp
+++ b/ginac/mul.cpp
@@ -598,7 +598,7 @@ ex mul::algebraic_subs_mul(const exmap & m, unsigned options) const
                                                subsresult[j] = op(j);
                                        else {
                                                foundfirstsubsedfactor = true;
                                                subsresult[j] = op(j);
                                        else {
                                                foundfirstsubsedfactor = true;

-                                               subsresult[j] = op(j) * power(it->second.subs(ex(repls), subs_options::subs_no_pattern) / it->first.subs(ex(repls), subs_options::subs_no_pattern), nummatches);
+                                               subsresult[j] = op(j) * power(it->second.subs(ex(repls), subs_options::no_pattern) / it->first.subs(ex(repls), subs_options::no_pattern), nummatches);

                                        }
                                        subsed[j] = true;
                                }
                                        }
                                        subsed[j] = true;
                                }


@@ -612,7 +612,7 @@ ex mul::algebraic_subs_mul(const exmap & m, unsigned options) const
                        for (size_t j=0; j<this->nops(); j++) {
                                if (!subsed[j] && tryfactsubs(op(j), it->first, nummatches, repls)) {
                                        subsed[j] = true;
                        for (size_t j=0; j<this->nops(); j++) {
                                if (!subsed[j] && tryfactsubs(op(j), it->first, nummatches, repls)) {
                                        subsed[j] = true;

-                                       subsresult[j] = op(j) * power(it->second.subs(ex(repls), subs_options::subs_no_pattern) / it->first.subs(ex(repls), subs_options::subs_no_pattern), nummatches);
+                                       subsresult[j] = op(j) * power(it->second.subs(ex(repls), subs_options::no_pattern) / it->first.subs(ex(repls), subs_options::no_pattern), nummatches);

                                }
                        }
                }
                                }
                        }
                }


@@ -626,7 +626,7 @@ ex mul::algebraic_subs_mul(const exmap & m, unsigned options) const
                }
        }
        if (!subsfound)
                }
        }
        if (!subsfound)

-               return subs_one_level(m, options | subs_options::subs_algebraic);
+               return subs_one_level(m, options | subs_options::algebraic);

 
        exvector ev; ev.reserve(nops());
        for (size_t i=0; i<nops(); i++) {
 
        exvector ev; ev.reserve(nops());
        for (size_t i=0; i<nops(); i++) {