return new mul(*this);
}
-void mul::print(ostream & os, unsigned upper_precedence) const
+void mul::print(std::ostream & os, unsigned upper_precedence) const
{
debugmsg("mul print",LOGLEVEL_PRINT);
if (precedence<=upper_precedence) os << "(";
if (precedence<=upper_precedence) os << ")";
}
-void mul::printraw(ostream & os) const
+void mul::printraw(std::ostream & os) const
{
debugmsg("mul printraw",LOGLEVEL_PRINT);
os << ")";
}
-void mul::printcsrc(ostream & os, unsigned type, unsigned upper_precedence) const
+void mul::printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence) const
{
debugmsg("mul print csrc", LOGLEVEL_PRINT);
if (precedence <= upper_precedence)
(ex(power(it->rest, abs(ex_to_numeric(it->coeff))))).bp->printcsrc(os, type, upper_precedence);
// Separator is "/" for negative integer powers, "*" otherwise
- it++;
+ ++it;
if (it != itend) {
if (ex_to_numeric(it->coeff).is_integer() && it->coeff.compare(_num0()) < 0)
os << "/";
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;
+typedef std::vector<int> intvector;
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();
}
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 (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();
}
// protected
-/** Implementation of ex::diff() for a product. It applies the product rule.
+/** 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));
+ exvector addseq;
+ addseq.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 mulseq = seq;
+ mulseq[i] = split_ex_to_pair(power(seq[i].rest,seq[i].coeff - _ex1())*
+ seq[i].rest.diff(s));
+ addseq.push_back((new mul(mulseq,overall_coeff*seq[i].coeff))->setflag(status_flags::dynallocated));
}
- return (new add(new_seq))->setflag(status_flags::dynallocated);
+ return (new add(addseq))->setflag(status_flags::dynallocated);
}
int mul::compare_same_type(const basic & other) const
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
// we create a temporary power object
// otherwise it would be hard to correctly simplify
// expression like (4^(1/3))^(3/2)
- if (are_ex_trivially_equal(c,_ex1())) {
+ if (are_ex_trivially_equal(c,_ex1()))
return split_ex_to_pair(e);
- }
+
return split_ex_to_pair(power(e,c));
}
// we create a temporary power object
// otherwise it would be hard to correctly simplify
// expression like (4^(1/3))^(3/2)
- if (are_ex_trivially_equal(c,_ex1())) {
+ if (are_ex_trivially_equal(c,_ex1()))
return p;
- }
+
return split_ex_to_pair(power(recombine_pair_to_ex(p),c));
}
{
// if (p.coeff.compare(_ex1())==0) {
// if (are_ex_trivially_equal(p.coeff,_ex1())) {
- if (ex_to_numeric(p.coeff).is_equal(_num1())) {
+ if (ex_to_numeric(p.coeff).is_equal(_num1()))
return p.rest;
- } else {
+ else
return power(p.rest,p.coeff);
- }
}
bool mul::expair_needs_further_processing(epp it)
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);
-
+
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();
- 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()))) {
+ for (epvector::const_iterator cit = expanded_seq.begin(); cit!=last; ++cit) {
+ if (is_ex_exactly_of_type((*cit).rest,add) &&
+ ((*cit).coeff.is_equal(_ex1()))) {
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++;
+ ++number_of_adds;
}
- current_position++;
+ ++current_position;
}
-
+
if (number_of_adds==0) {
- if (expanded_seqp==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);
+ else
+ return ((new mul(expanded_seqp,overall_coeff))->
+ setflag(status_flags::dynallocated |
+ status_flags::expanded));
}
-
+
exvector distrseq;
distrseq.reserve(number_of_expanded_terms);
-
+
intvector k;
- k.resize(number_of_adds);
+ k.resize(number_of_adds, 0);
- int l;
- for (l=0; l<number_of_adds; l++) {
- k[l]=0;
- }
-
while (1) {
epvector term;
- term=expanded_seq;
- for (l=0; l<number_of_adds; l++) {
- const add & addref=ex_to_add(expanded_seq[positions_of_adds[l]].rest);
+ term = expanded_seq;
+ for (int l=0; l<number_of_adds; ++l) {
+ 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])) {
- k[l]=0;
- l--;
+ int l = number_of_adds-1;
+ 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);
}
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();
while (cit2!=cit) {
git://www.ginac.de / ginac.git / blobdiff