#include "debugmsg.h"
#include "utils.h"
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
GINAC_IMPLEMENT_REGISTERED_CLASS(mul, expairseq)
destroy(0);
}
-mul::mul(mul const & other)
+mul::mul(const mul & other)
{
debugmsg("mul copy constructor",LOGLEVEL_CONSTRUCT);
copy(other);
}
-mul const & mul::operator=(mul const & other)
+const mul & mul::operator=(const mul & other)
{
debugmsg("mul operator=",LOGLEVEL_ASSIGNMENT);
if (this != &other) {
// protected
-void mul::copy(mul const & other)
+void mul::copy(const mul & other)
{
inherited::copy(other);
}
// public
-mul::mul(ex const & lh, ex const & rh)
+mul::mul(const ex & lh, const ex & rh)
{
debugmsg("mul constructor from ex,ex",LOGLEVEL_CONSTRUCT);
tinfo_key = TINFO_mul;
- overall_coeff=_ex1();
+ overall_coeff = _ex1();
construct_from_2_ex(lh,rh);
GINAC_ASSERT(is_canonical());
}
-mul::mul(exvector const & v)
+mul::mul(const exvector & v)
{
debugmsg("mul constructor from exvector",LOGLEVEL_CONSTRUCT);
tinfo_key = TINFO_mul;
- overall_coeff=_ex1();
+ overall_coeff = _ex1();
construct_from_exvector(v);
GINAC_ASSERT(is_canonical());
}
-/*
-mul::mul(epvector const & v, bool do_not_canonicalize)
-{
- debugmsg("mul constructor from epvector,bool",LOGLEVEL_CONSTRUCT);
- tinfo_key = TINFO_mul;
- if (do_not_canonicalize) {
- seq=v;
-#ifdef EXPAIRSEQ_USE_HASHTAB
- combine_same_terms(); // to build hashtab
-#endif // def EXPAIRSEQ_USE_HASHTAB
- } else {
- construct_from_epvector(v);
- }
- GINAC_ASSERT(is_canonical());
-}
-*/
-
-mul::mul(epvector const & v)
+mul::mul(const epvector & v)
{
debugmsg("mul constructor from epvector",LOGLEVEL_CONSTRUCT);
tinfo_key = TINFO_mul;
- overall_coeff=_ex1();
+ overall_coeff = _ex1();
construct_from_epvector(v);
GINAC_ASSERT(is_canonical());
}
-mul::mul(epvector const & v, ex const & oc)
+mul::mul(const epvector & v, const ex & oc)
{
debugmsg("mul constructor from epvector,ex",LOGLEVEL_CONSTRUCT);
tinfo_key = TINFO_mul;
- overall_coeff=oc;
+ overall_coeff = oc;
construct_from_epvector(v);
GINAC_ASSERT(is_canonical());
}
-mul::mul(epvector * vp, ex const & oc)
+mul::mul(epvector * vp, const ex & oc)
{
debugmsg("mul constructor from epvector *,ex",LOGLEVEL_CONSTRUCT);
tinfo_key = TINFO_mul;
GINAC_ASSERT(vp!=0);
- overall_coeff=oc;
+ overall_coeff = oc;
construct_from_epvector(*vp);
delete vp;
GINAC_ASSERT(is_canonical());
}
-mul::mul(ex const & lh, ex const & mh, ex const & rh)
+mul::mul(const ex & lh, const ex & mh, const ex & rh)
{
debugmsg("mul constructor from ex,ex,ex",LOGLEVEL_CONSTRUCT);
tinfo_key = TINFO_mul;
factors.push_back(lh);
factors.push_back(mh);
factors.push_back(rh);
- overall_coeff=_ex1();
+ overall_coeff = _ex1();
construct_from_exvector(factors);
GINAC_ASSERT(is_canonical());
}
bool mul::info(unsigned inf) const
{
- // TODO: optimize
- if (inf==info_flags::polynomial ||
- inf==info_flags::integer_polynomial ||
- inf==info_flags::cinteger_polynomial ||
- inf==info_flags::rational_polynomial ||
- inf==info_flags::crational_polynomial ||
- inf==info_flags::rational_function) {
- for (epvector::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
- if (!(recombine_pair_to_ex(*it).info(inf)))
- return false;
+ switch (inf) {
+ case info_flags::polynomial:
+ case info_flags::integer_polynomial:
+ case info_flags::cinteger_polynomial:
+ case info_flags::rational_polynomial:
+ case info_flags::crational_polynomial:
+ case info_flags::rational_function: {
+ for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i) {
+ if (!(recombine_pair_to_ex(*i).info(inf)))
+ return false;
+ }
+ return overall_coeff.info(inf);
+ }
+ case info_flags::algebraic: {
+ for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i) {
+ if ((recombine_pair_to_ex(*i).info(inf)))
+ return true;
+ }
+ return false;
}
- return overall_coeff.info(inf);
- } else {
- return inherited::info(inf);
}
+ return inherited::info(inf);
}
typedef vector<int> intvector;
-int mul::degree(symbol const & s) const
+int mul::degree(const symbol & s) const
{
- int deg_sum=0;
+ int deg_sum = 0;
for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) {
deg_sum+=(*cit).rest.degree(s) * ex_to_numeric((*cit).coeff).to_int();
}
return deg_sum;
}
-int mul::ldegree(symbol const & s) const
+int mul::ldegree(const symbol & s) const
{
- int deg_sum=0;
+ int deg_sum = 0;
for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) {
deg_sum+=(*cit).rest.ldegree(s) * ex_to_numeric((*cit).coeff).to_int();
}
return deg_sum;
}
-ex mul::coeff(symbol const & s, int const n) const
+ex mul::coeff(const symbol & s, int n) const
{
exvector coeffseq;
coeffseq.reserve(seq.size()+1);
is_ex_exactly_of_type((*seq.begin()).rest,add) &&
ex_to_numeric((*seq.begin()).coeff).is_equal(_num1())) {
// *(+(x,y,...);c) -> +(*(x,c),*(y,c),...) (c numeric(), no powers of +())
- add const & addref=ex_to_add((*seq.begin()).rest);
+ const add & addref=ex_to_add((*seq.begin()).rest);
epvector distrseq;
distrseq.reserve(addref.seq.size());
for (epvector::const_iterator cit=addref.seq.begin(); cit!=addref.seq.end(); ++cit) {
return (new add(distrseq,
ex_to_numeric(addref.overall_coeff).
mul_dyn(ex_to_numeric(overall_coeff))))
- ->setflag(status_flags::dynallocated |
- status_flags::evaluated );
+ ->setflag(status_flags::dynallocated |
+ status_flags::evaluated);
}
return this->hold();
}
+ex mul::evalf(int level) const
+{
+ if (level==1)
+ return mul(seq,overall_coeff);
+
+ if (level==-max_recursion_level)
+ throw(std::runtime_error("max recursion level reached"));
+
+ epvector s;
+ s.reserve(seq.size());
+
+ --level;
+ for (epvector::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
+ s.push_back(combine_ex_with_coeff_to_pair((*it).rest.evalf(level),
+ (*it).coeff));
+ }
+ return mul(s,overall_coeff.evalf(level));
+}
+
exvector mul::get_indices(void) const
{
// return union of indices of factors
return iv;
}
-ex mul::simplify_ncmul(exvector const & v) const
+ex mul::simplify_ncmul(const exvector & v) const
{
throw(std::logic_error("mul::simplify_ncmul() should never have been called!"));
}
// protected
-int mul::compare_same_type(basic const & other) const
+/** Implementation of ex::diff() for a product. It applies the product rule.
+ * @see ex::diff */
+ex mul::derivative(const symbol & s) const
+{
+ exvector new_seq;
+ new_seq.reserve(seq.size());
+
+ // D(a*b*c)=D(a)*b*c+a*D(b)*c+a*b*D(c)
+ for (unsigned i=0; i!=seq.size(); i++) {
+ epvector sub_seq = seq;
+ sub_seq[i] = split_ex_to_pair(sub_seq[i].coeff*
+ power(sub_seq[i].rest,sub_seq[i].coeff-1)*
+ sub_seq[i].rest.diff(s));
+ new_seq.push_back((new mul(sub_seq,overall_coeff))->setflag(status_flags::dynallocated));
+ }
+ return (new add(new_seq))->setflag(status_flags::dynallocated);
+}
+
+int mul::compare_same_type(const basic & other) const
{
return inherited::compare_same_type(other);
}
-bool mul::is_equal_same_type(basic const & other) const
+bool mul::is_equal_same_type(const basic & other) const
{
return inherited::is_equal_same_type(other);
}
return return_types::commutative;
}
- bool all_commutative=1;
+ bool all_commutative = 1;
unsigned rt;
epvector::const_iterator cit_noncommutative_element; // point to first found nc element
if (rt==return_types::noncommutative_composite) return rt; // one ncc -> mul also ncc
if ((rt==return_types::noncommutative)&&(all_commutative)) {
// first nc element found, remember position
- cit_noncommutative_element=cit;
- all_commutative=0;
+ cit_noncommutative_element = cit;
+ all_commutative = 0;
}
if ((rt==return_types::noncommutative)&&(!all_commutative)) {
// another nc element found, compare type_infos
return tinfo_key;
}
-ex mul::thisexpairseq(epvector const & v, ex const & oc) const
+ex mul::thisexpairseq(const epvector & v, const ex & oc) const
{
return (new mul(v,oc))->setflag(status_flags::dynallocated);
}
-ex mul::thisexpairseq(epvector * vp, ex const & oc) const
+ex mul::thisexpairseq(epvector * vp, const ex & oc) const
{
return (new mul(vp,oc))->setflag(status_flags::dynallocated);
}
-expair mul::split_ex_to_pair(ex const & e) const
+expair mul::split_ex_to_pair(const ex & e) const
{
if (is_ex_exactly_of_type(e,power)) {
- power const & powerref=ex_to_power(e);
+ const power & powerref=ex_to_power(e);
if (is_ex_exactly_of_type(powerref.exponent,numeric)) {
return expair(powerref.basis,powerref.exponent);
}
return expair(e,_ex1());
}
-expair mul::combine_ex_with_coeff_to_pair(ex const & e,
- ex const & c) const
+expair mul::combine_ex_with_coeff_to_pair(const ex & e,
+ const ex & c) const
{
// to avoid duplication of power simplification rules,
// we create a temporary power object
return split_ex_to_pair(power(e,c));
}
-expair mul::combine_pair_with_coeff_to_pair(expair const & p,
- ex const & c) const
+expair mul::combine_pair_with_coeff_to_pair(const expair & p,
+ const ex & c) const
{
// to avoid duplication of power simplification rules,
// we create a temporary power object
return split_ex_to_pair(power(recombine_pair_to_ex(p),c));
}
-ex mul::recombine_pair_to_ex(expair const & p) const
+ex mul::recombine_pair_to_ex(const expair & p) const
{
// if (p.coeff.compare(_ex1())==0) {
// if (are_ex_trivially_equal(p.coeff,_ex1())) {
return _ex1();
}
-void mul::combine_overall_coeff(ex const & c)
+void mul::combine_overall_coeff(const ex & c)
{
GINAC_ASSERT(is_ex_exactly_of_type(overall_coeff,numeric));
GINAC_ASSERT(is_ex_exactly_of_type(c,numeric));
overall_coeff = ex_to_numeric(overall_coeff).mul_dyn(ex_to_numeric(c));
}
-void mul::combine_overall_coeff(ex const & c1, ex const & c2)
+void mul::combine_overall_coeff(const ex & c1, const ex & c2)
{
GINAC_ASSERT(is_ex_exactly_of_type(overall_coeff,numeric));
GINAC_ASSERT(is_ex_exactly_of_type(c1,numeric));
mul_dyn(ex_to_numeric(c1).power(ex_to_numeric(c2)));
}
-bool mul::can_make_flat(expair const & p) const
+bool mul::can_make_flat(const expair & p) const
{
GINAC_ASSERT(is_ex_exactly_of_type(p.coeff,numeric));
// this assertion will probably fail somewhere
ex mul::expand(unsigned options) const
{
+ if (flags & status_flags::expanded)
+ return *this;
+
exvector sub_expanded_seq;
intvector positions_of_adds;
intvector number_of_add_operands;
-
- epvector * expanded_seqp=expandchildren(options);
-
- epvector const & expanded_seq = expanded_seqp==0 ? seq : *expanded_seqp;
-
+
+ epvector * expanded_seqp = expandchildren(options);
+
+ const epvector & expanded_seq = expanded_seqp==0 ? seq : *expanded_seqp;
+
positions_of_adds.resize(expanded_seq.size());
number_of_add_operands.resize(expanded_seq.size());
-
- int number_of_adds=0;
- int number_of_expanded_terms=1;
-
- unsigned current_position=0;
- epvector::const_iterator last=expanded_seq.end();
+
+ int number_of_adds = 0;
+ int number_of_expanded_terms = 1;
+
+ unsigned current_position = 0;
+ epvector::const_iterator last = expanded_seq.end();
for (epvector::const_iterator cit=expanded_seq.begin(); cit!=last; ++cit) {
if (is_ex_exactly_of_type((*cit).rest,add)&&
(ex_to_numeric((*cit).coeff).is_equal(_num1()))) {
- positions_of_adds[number_of_adds]=current_position;
- add const & expanded_addref=ex_to_add((*cit).rest);
- unsigned addref_nops=expanded_addref.nops();
- number_of_add_operands[number_of_adds]=addref_nops;
+ positions_of_adds[number_of_adds] = current_position;
+ const add & expanded_addref = ex_to_add((*cit).rest);
+ unsigned addref_nops = expanded_addref.nops();
+ number_of_add_operands[number_of_adds] = addref_nops;
number_of_expanded_terms *= addref_nops;
number_of_adds++;
}
current_position++;
}
-
+
if (number_of_adds==0) {
if (expanded_seqp==0) {
return this->setflag(status_flags::expanded);
}
return (new mul(expanded_seqp,overall_coeff))->
- setflag(status_flags::dynallocated ||
- status_flags::expanded);
+ setflag(status_flags::dynallocated |
+ status_flags::expanded);
}
-
+
exvector distrseq;
distrseq.reserve(number_of_expanded_terms);
-
+
intvector k;
k.resize(number_of_adds);
for (l=0; l<number_of_adds; l++) {
k[l]=0;
}
-
+
while (1) {
epvector term;
- term=expanded_seq;
+ term = expanded_seq;
for (l=0; l<number_of_adds; l++) {
- add const & addref=ex_to_add(expanded_seq[positions_of_adds[l]].rest);
+ const add & addref=ex_to_add(expanded_seq[positions_of_adds[l]].rest);
GINAC_ASSERT(term[positions_of_adds[l]].coeff.compare(_ex1())==0);
term[positions_of_adds[l]]=split_ex_to_pair(addref.op(k[l]));
}
- /*
- cout << "mul::expand() term begin" << endl;
- for (epvector::const_iterator cit=term.begin(); cit!=term.end(); ++cit) {
- cout << "rest" << endl;
- (*cit).rest.printtree(cout);
- cout << "coeff" << endl;
- (*cit).coeff.printtree(cout);
- }
- cout << "mul::expand() term end" << endl;
- */
distrseq.push_back((new mul(term,overall_coeff))->
- setflag(status_flags::dynallocated |
- status_flags::expanded));
-
+ setflag(status_flags::dynallocated |
+ status_flags::expanded));
+
// increment k[]
l=number_of_adds-1;
- while ((l>=0)&&((++k[l])>=number_of_add_operands[l])) {
+ while ((l>=0) && ((++k[l])>=number_of_add_operands[l])) {
k[l]=0;
l--;
}
if (l<0) break;
}
-
- if (expanded_seqp!=0) {
+
+ if (expanded_seqp!=0)
delete expanded_seqp;
- }
- /*
- cout << "mul::expand() distrseq begin" << endl;
- for (exvector::const_iterator cit=distrseq.begin(); cit!=distrseq.end(); ++cit) {
- (*cit).printtree(cout);
- }
- cout << "mul::expand() distrseq end" << endl;
- */
-
+
return (new add(distrseq))->setflag(status_flags::dynallocated |
status_flags::expanded);
}
epvector * mul::expandchildren(unsigned options) const
{
- epvector::const_iterator last=seq.end();
- epvector::const_iterator cit=seq.begin();
+ epvector::const_iterator last = seq.end();
+ epvector::const_iterator cit = seq.begin();
while (cit!=last) {
- ex const & factor=recombine_pair_to_ex(*cit);
- ex const & expanded_factor=factor.expand(options);
+ const ex & factor = recombine_pair_to_ex(*cit);
+ const ex & expanded_factor = factor.expand(options);
if (!are_ex_trivially_equal(factor,expanded_factor)) {
-
+
// something changed, copy seq, eval and return it
epvector *s=new epvector;
s->reserve(seq.size());
-
+
// copy parts of seq which are known not to have changed
- epvector::const_iterator cit2=seq.begin();
+ epvector::const_iterator cit2 = seq.begin();
while (cit2!=cit) {
s->push_back(*cit2);
++cit2;
// protected
-unsigned mul::precedence=50;
+unsigned mul::precedence = 50;
//////////
//////////
const mul some_mul;
-type_info const & typeid_mul=typeid(some_mul);
+const type_info & typeid_mul = typeid(some_mul);
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
} // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
git://www.ginac.de / ginac.git / blobdiff