* Implementation of GiNaC's sums of expressions. */
/*
- * GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2005 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <iostream>
#include "operators.h"
#include "matrix.h"
#include "utils.h"
+#include "clifford.h"
+#include "ncmul.h"
namespace GiNaC {
print_func<print_context>(&add::do_print).
print_func<print_latex>(&add::do_print_latex).
print_func<print_csrc>(&add::do_print_csrc).
- print_func<print_tree>(&inherited::do_print_tree).
+ print_func<print_tree>(&add::do_print_tree).
print_func<print_python_repr>(&add::do_print_python_repr))
//////////
GINAC_ASSERT(is_canonical());
}
-add::add(epvector * vp, const ex & oc)
+add::add(std::auto_ptr<epvector> vp, const ex & oc)
{
tinfo_key = TINFO_add;
- GINAC_ASSERT(vp!=0);
+ GINAC_ASSERT(vp.get()!=0);
overall_coeff = oc;
construct_from_epvector(*vp);
- delete vp;
GINAC_ASSERT(is_canonical());
}
if (coeff.csgn() == -1) c.s << '-';
first = false;
}
- if (!coeff.is_equal(_num1) &&
- !coeff.is_equal(_num_1)) {
+ if (!coeff.is_equal(*_num1_p) &&
+ !coeff.is_equal(*_num_1_p)) {
if (coeff.is_rational()) {
if (coeff.is_negative())
(-coeff).print(c);
} else if (it->coeff.is_equal(_ex_1)) {
c.s << "-";
it->rest.print(c, precedence());
- } else if (ex_to<numeric>(it->coeff).numer().is_equal(_num1)) {
+ } else if (ex_to<numeric>(it->coeff).numer().is_equal(*_num1_p)) {
it->rest.print(c, precedence());
c.s << "/";
ex_to<numeric>(it->coeff).denom().print(c, precedence());
- } else if (ex_to<numeric>(it->coeff).numer().is_equal(_num_1)) {
+ } else if (ex_to<numeric>(it->coeff).numer().is_equal(*_num_1_p)) {
c.s << "-";
it->rest.print(c, precedence());
c.s << "/";
++it;
if (it != itend
&& (is_a<print_csrc_cl_N>(c) || !it->coeff.info(info_flags::real) // sign inside ctor arguments
- || !(it->coeff.info(info_flags::negative) || (it->coeff.is_equal(_num1) && is_exactly_a<numeric>(it->rest) && it->rest.info(info_flags::negative)))))
+ || !(it->coeff.info(info_flags::negative) || (it->coeff.is_equal(*_num1_p) && is_exactly_a<numeric>(it->rest) && it->rest.info(info_flags::negative)))))
c.s << "+";
}
ex add::coeff(const ex & s, int n) const
{
- epvector *coeffseq = new epvector();
+ std::auto_ptr<epvector> coeffseq(new epvector);
+ std::auto_ptr<epvector> coeffseq_cliff(new epvector);
+ char rl = clifford_max_label(s);
+ bool do_clifford = (rl != -1);
+ bool nonscalar = false;
// Calculate sum of coefficients in each term
epvector::const_iterator i = seq.begin(), end = seq.end();
while (i != end) {
ex restcoeff = i->rest.coeff(s, n);
- if (!restcoeff.is_zero())
+ if (!restcoeff.is_zero()) {
+ if (do_clifford) {
+ if (clifford_max_label(restcoeff) == -1) {
+ coeffseq_cliff->push_back(combine_ex_with_coeff_to_pair(ncmul(restcoeff, dirac_ONE(rl)), i->coeff));
+ } else {
+ coeffseq_cliff->push_back(combine_ex_with_coeff_to_pair(restcoeff, i->coeff));
+ nonscalar = true;
+ }
+ }
coeffseq->push_back(combine_ex_with_coeff_to_pair(restcoeff, i->coeff));
+ }
++i;
}
- return (new add(coeffseq, n==0 ? overall_coeff : _ex0))->setflag(status_flags::dynallocated);
+ return (new add(nonscalar ? coeffseq_cliff : coeffseq,
+ n==0 ? overall_coeff : _ex0))->setflag(status_flags::dynallocated);
}
/** Perform automatic term rewriting rules in this class. In the following
* @param level cut-off in recursive evaluation */
ex add::eval(int level) const
{
- epvector *evaled_seqp = evalchildren(level);
- if (evaled_seqp) {
+ std::auto_ptr<epvector> evaled_seqp = evalchildren(level);
+ if (evaled_seqp.get()) {
// do more evaluation later
return (new add(evaled_seqp, overall_coeff))->
setflag(status_flags::dynallocated);
{
// Evaluate children first and add up all matrices. Stop if there's one
// term that is not a matrix.
- epvector *s = new epvector;
+ std::auto_ptr<epvector> s(new epvector);
s->reserve(seq.size());
bool all_matrices = true;
++it;
}
- if (all_matrices) {
- delete s;
+ if (all_matrices)
return sum + overall_coeff;
- } else
+ else
return (new add(s, overall_coeff))->setflag(status_flags::dynallocated);
}
+ex add::conjugate() const
+{
+ exvector *v = 0;
+ for (int i=0; i<nops(); ++i) {
+ if (v) {
+ v->push_back(op(i).conjugate());
+ continue;
+ }
+ ex term = op(i);
+ ex ccterm = term.conjugate();
+ if (are_ex_trivially_equal(term, ccterm))
+ continue;
+ v = new exvector;
+ v->reserve(nops());
+ for (int j=0; j<i; ++j)
+ v->push_back(op(j));
+ v->push_back(ccterm);
+ }
+ if (v) {
+ ex result = add(*v);
+ delete v;
+ return result;
+ }
+ return *this;
+}
+
ex add::eval_ncmul(const exvector & v) const
{
if (seq.empty())
* @see ex::diff */
ex add::derivative(const symbol & y) const
{
- epvector *s = new epvector();
+ std::auto_ptr<epvector> s(new epvector);
s->reserve(seq.size());
// Only differentiate the "rest" parts of the expairs. This is faster
else
return seq.begin()->rest.return_type();
}
-
+
unsigned add::return_type_tinfo() const
{
if (seq.empty())
return (new add(v,oc))->setflag(status_flags::dynallocated);
}
-ex add::thisexpairseq(epvector * vp, const ex & oc) const
+ex add::thisexpairseq(std::auto_ptr<epvector> vp, const ex & oc) const
{
return (new add(vp,oc))->setflag(status_flags::dynallocated);
}
GINAC_ASSERT(is_exactly_a<numeric>(c));
if (is_exactly_a<numeric>(p.rest)) {
- GINAC_ASSERT(ex_to<numeric>(p.coeff).is_equal(_num1)); // should be normalized
+ GINAC_ASSERT(ex_to<numeric>(p.coeff).is_equal(*_num1_p)); // should be normalized
return expair(ex_to<numeric>(p.rest).mul_dyn(ex_to<numeric>(c)),_ex1);
}
ex add::recombine_pair_to_ex(const expair & p) const
{
- if (ex_to<numeric>(p.coeff).is_equal(_num1))
+ if (ex_to<numeric>(p.coeff).is_equal(*_num1_p))
return p.rest;
else
return (new mul(p.rest,p.coeff))->setflag(status_flags::dynallocated);
ex add::expand(unsigned options) const
{
- epvector *vp = expandchildren(options);
- if (vp == NULL) {
+ std::auto_ptr<epvector> vp = expandchildren(options);
+ if (vp.get() == 0) {
// the terms have not changed, so it is safe to declare this expanded
return (options == 0) ? setflag(status_flags::expanded) : *this;
}
git://www.ginac.de / ginac.git / blobdiff