* Implementation of GiNaC's sums of expressions. */
/*
- * GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "add.h"
#include "mul.h"
+#include "archive.h"
#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(add, expairseq)
//////////
// default constructor, destructor, copy constructor assignment operator and helpers
destroy(0);
}
-add::add(add const & other)
+add::add(const add & other)
{
debugmsg("add copy constructor",LOGLEVEL_CONSTRUCT);
copy(other);
}
-add const & add::operator=(add const & other)
+const add & add::operator=(const add & other)
{
debugmsg("add operator=",LOGLEVEL_ASSIGNMENT);
if (this != &other) {
// protected
-void add::copy(add const & other)
+void add::copy(const add & other)
{
- expairseq::copy(other);
+ inherited::copy(other);
}
void add::destroy(bool call_parent)
{
- if (call_parent) expairseq::destroy(call_parent);
+ if (call_parent) inherited::destroy(call_parent);
}
//////////
// public
-add::add(ex const & lh, ex const & rh)
+add::add(const ex & lh, const ex & rh)
{
debugmsg("add constructor from ex,ex",LOGLEVEL_CONSTRUCT);
tinfo_key = TINFO_add;
- overall_coeff=_ex0();
+ overall_coeff = _ex0();
construct_from_2_ex(lh,rh);
GINAC_ASSERT(is_canonical());
}
-add::add(exvector const & v)
+add::add(const exvector & v)
{
debugmsg("add constructor from exvector",LOGLEVEL_CONSTRUCT);
tinfo_key = TINFO_add;
- overall_coeff=_ex0();
+ overall_coeff = _ex0();
construct_from_exvector(v);
GINAC_ASSERT(is_canonical());
}
/*
-add::add(epvector const & v, bool do_not_canonicalize)
+add::add(const epvector & v, bool do_not_canonicalize)
{
debugmsg("add constructor from epvector,bool",LOGLEVEL_CONSTRUCT);
tinfo_key = TINFO_add;
}
*/
-add::add(epvector const & v)
+add::add(const epvector & v)
{
debugmsg("add constructor from epvector",LOGLEVEL_CONSTRUCT);
tinfo_key = TINFO_add;
- overall_coeff=_ex0();
+ overall_coeff = _ex0();
construct_from_epvector(v);
GINAC_ASSERT(is_canonical());
}
-add::add(epvector const & v, ex const & oc)
+add::add(const epvector & v, const ex & oc)
{
debugmsg("add constructor from epvector,ex",LOGLEVEL_CONSTRUCT);
tinfo_key = TINFO_add;
- overall_coeff=oc;
+ overall_coeff = oc;
construct_from_epvector(v);
GINAC_ASSERT(is_canonical());
}
-add::add(epvector * vp, ex const & oc)
+add::add(epvector * vp, const ex & oc)
{
debugmsg("add constructor from epvector *,ex",LOGLEVEL_CONSTRUCT);
tinfo_key = TINFO_add;
GINAC_ASSERT(vp!=0);
- overall_coeff=oc;
+ overall_coeff = oc;
construct_from_epvector(*vp);
delete vp;
GINAC_ASSERT(is_canonical());
}
+//////////
+// archiving
+//////////
+
+/** Construct object from archive_node. */
+add::add(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
+{
+ debugmsg("add constructor from archive_node", LOGLEVEL_CONSTRUCT);
+}
+
+/** Unarchive the object. */
+ex add::unarchive(const archive_node &n, const lst &sym_lst)
+{
+ return (new add(n, sym_lst))->setflag(status_flags::dynallocated);
+}
+
+/** Archive the object. */
+void add::archive(archive_node &n) const
+{
+ inherited::archive(n);
+}
+
//////////
// functions overriding virtual functions from bases classes
//////////
debugmsg("add print",LOGLEVEL_PRINT);
if (precedence<=upper_precedence) os << "(";
numeric coeff;
- bool first=true;
+ bool first = true;
+ // first print the overall numeric coefficient, if present:
+ if (!overall_coeff.is_zero()) {
+ os << overall_coeff;
+ first = false;
+ }
+ // then proceed with the remaining factors:
for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) {
coeff = ex_to_numeric(cit->coeff);
if (!first) {
if (coeff.csgn()==-1) os << '-'; else os << '+';
} else {
if (coeff.csgn()==-1) os << '-';
- first=false;
+ first = false;
}
if (!coeff.is_equal(_num1()) &&
!coeff.is_equal(_num_1())) {
- if (coeff.csgn()==-1)
- (_num_1()*coeff).print(os, precedence);
- else
- coeff.print(os, precedence);
+ if (coeff.is_rational()) {
+ if (coeff.is_negative())
+ os << -coeff;
+ else
+ os << coeff;
+ } else {
+ if (coeff.csgn()==-1)
+ (-coeff).print(os, precedence);
+ else
+ coeff.print(os, precedence);
+ }
os << '*';
}
os << cit->rest;
}
- // print the overall numeric coefficient, if present:
- if (!overall_coeff.is_zero()) {
- if (overall_coeff.info(info_flags::positive)) os << '+';
- os << overall_coeff;
- }
if (precedence<=upper_precedence) os << ")";
}
}
return overall_coeff.info(inf);
} else {
- return expairseq::info(inf);
+ return inherited::info(inf);
}
}
-int add::degree(symbol const & s) const
+int add::degree(const symbol & s) const
{
- int deg=INT_MIN;
+ int deg = INT_MIN;
if (!overall_coeff.is_equal(_ex0())) {
- deg=0;
+ deg = 0;
}
int cur_deg;
for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) {
return deg;
}
-int add::ldegree(symbol const & s) const
+int add::ldegree(const symbol & s) const
{
- int deg=INT_MAX;
+ int deg = INT_MAX;
if (!overall_coeff.is_equal(_ex0())) {
- deg=0;
+ deg = 0;
}
int cur_deg;
for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) {
- cur_deg=(*cit).rest.ldegree(s);
+ cur_deg = (*cit).rest.ldegree(s);
if (cur_deg<deg) deg=cur_deg;
}
return deg;
}
-ex add::coeff(symbol const & s, int const n) const
+ex add::coeff(const symbol & s, int n) const
{
epvector coeffseq;
coeffseq.reserve(seq.size());
return (new add(evaled_seqp,overall_coeff))->
setflag(status_flags::dynallocated);
}
-
+
#ifdef DO_GINAC_ASSERT
for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) {
GINAC_ASSERT(!is_ex_exactly_of_type((*cit).rest,add));
GINAC_ASSERT(!is_ex_exactly_of_type((*cit).rest,numeric));
}
#endif // def DO_GINAC_ASSERT
-
+
if (flags & status_flags::evaluated) {
GINAC_ASSERT(seq.size()>0);
GINAC_ASSERT((seq.size()>1)||!overall_coeff.is_equal(_ex0()));
return *this;
}
-
+
int seq_size=seq.size();
if (seq_size==0) {
// +(;c) -> c
return (seq.begin())->rest.get_indices();
}
-ex add::simplify_ncmul(exvector const & v) const
+ex add::simplify_ncmul(const exvector & v) const
{
if (seq.size()==0) {
- return expairseq::simplify_ncmul(v);
+ return inherited::simplify_ncmul(v);
}
return (*seq.begin()).rest.simplify_ncmul(v);
}
// protected
-int add::compare_same_type(basic const & other) const
+/** Implementation of ex::diff() for a sum. It differentiates each term.
+ * @see ex::diff */
+ex add::derivative(const symbol & s) const
{
- return expairseq::compare_same_type(other);
+ // D(a+b+c)=D(a)+D(b)+D(c)
+ return (new add(diffchildren(s)))->setflag(status_flags::dynallocated);
}
-bool add::is_equal_same_type(basic const & other) const
+int add::compare_same_type(const basic & other) const
{
- return expairseq::is_equal_same_type(other);
+ return inherited::compare_same_type(other);
+}
+
+bool add::is_equal_same_type(const basic & other) const
+{
+ return inherited::is_equal_same_type(other);
}
unsigned add::return_type(void) const
return (*seq.begin()).rest.return_type_tinfo();
}
-ex add::thisexpairseq(epvector const & v, ex const & oc) const
+ex add::thisexpairseq(const epvector & v, const ex & oc) const
{
return (new add(v,oc))->setflag(status_flags::dynallocated);
}
-ex add::thisexpairseq(epvector * vp, ex const & oc) const
+ex add::thisexpairseq(epvector * vp, const ex & oc) const
{
return (new add(vp,oc))->setflag(status_flags::dynallocated);
}
-expair add::split_ex_to_pair(ex const & e) const
+expair add::split_ex_to_pair(const ex & e) const
{
if (is_ex_exactly_of_type(e,mul)) {
- mul const & mulref=ex_to_mul(e);
+ const mul & mulref=ex_to_mul(e);
ex numfactor=mulref.overall_coeff;
// mul * mulcopyp=static_cast<mul *>(mulref.duplicate());
mul * mulcopyp=new mul(mulref);
return expair(e,_ex1());
}
-expair add::combine_ex_with_coeff_to_pair(ex const & e,
- ex const & c) const
+expair add::combine_ex_with_coeff_to_pair(const ex & e,
+ const ex & c) const
{
GINAC_ASSERT(is_ex_exactly_of_type(c,numeric));
if (is_ex_exactly_of_type(e,mul)) {
- mul const & mulref=ex_to_mul(e);
+ const mul & mulref=ex_to_mul(e);
ex numfactor=mulref.overall_coeff;
//mul * mulcopyp=static_cast<mul *>(mulref.duplicate());
mul * mulcopyp=new mul(mulref);
return expair(e,c);
}
-expair add::combine_pair_with_coeff_to_pair(expair const & p,
- ex const & c) const
+expair add::combine_pair_with_coeff_to_pair(const expair & p,
+ const ex & c) const
{
GINAC_ASSERT(is_ex_exactly_of_type(p.coeff,numeric));
GINAC_ASSERT(is_ex_exactly_of_type(c,numeric));
return expair(p.rest,ex_to_numeric(p.coeff).mul_dyn(ex_to_numeric(c)));
}
-ex add::recombine_pair_to_ex(expair const & p) const
+ex add::recombine_pair_to_ex(const expair & p) const
{
//if (p.coeff.compare(_ex1())==0) {
//if (are_ex_trivially_equal(p.coeff,_ex1())) {
ex add::expand(unsigned options) const
{
- epvector * vp=expandchildren(options);
+ if (flags & status_flags::expanded)
+ return *this;
+
+ epvector * vp = expandchildren(options);
if (vp==0) {
return *this;
}
- return (new add(vp,overall_coeff))->setflag(status_flags::expanded |
- status_flags::dynallocated );
+ return (new add(vp,overall_coeff))->
+ setflag(status_flags::expanded |
+ status_flags::dynallocated);
}
//////////
// protected
-unsigned add::precedence=40;
+unsigned add::precedence = 40;
//////////
// global constants
//////////
const add some_add;
-type_info const & typeid_add=typeid(some_add);
+const type_info & typeid_add = typeid(some_add);
-#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