* Implementation of GiNaC's non-commutative products of expressions. */
/*
- * GiNaC Copyright (C) 1999-2005 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2008 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 "ex.h"
#include "add.h"
#include "mul.h"
+#include "clifford.h"
#include "matrix.h"
#include "archive.h"
#include "indexed.h"
ncmul::ncmul()
{
- tinfo_key = TINFO_ncmul;
+ tinfo_key = &ncmul::tinfo_static;
}
//////////
ncmul::ncmul(const ex & lh, const ex & rh) : inherited(lh,rh)
{
- tinfo_key = TINFO_ncmul;
+ tinfo_key = &ncmul::tinfo_static;
}
ncmul::ncmul(const ex & f1, const ex & f2, const ex & f3) : inherited(f1,f2,f3)
{
- tinfo_key = TINFO_ncmul;
+ tinfo_key = &ncmul::tinfo_static;
}
ncmul::ncmul(const ex & f1, const ex & f2, const ex & f3,
const ex & f4) : inherited(f1,f2,f3,f4)
{
- tinfo_key = TINFO_ncmul;
+ tinfo_key = &ncmul::tinfo_static;
}
ncmul::ncmul(const ex & f1, const ex & f2, const ex & f3,
const ex & f4, const ex & f5) : inherited(f1,f2,f3,f4,f5)
{
- tinfo_key = TINFO_ncmul;
+ tinfo_key = &ncmul::tinfo_static;
}
ncmul::ncmul(const ex & f1, const ex & f2, const ex & f3,
const ex & f4, const ex & f5, const ex & f6) : inherited(f1,f2,f3,f4,f5,f6)
{
- tinfo_key = TINFO_ncmul;
+ tinfo_key = &ncmul::tinfo_static;
}
ncmul::ncmul(const exvector & v, bool discardable) : inherited(v,discardable)
{
- tinfo_key = TINFO_ncmul;
+ tinfo_key = &ncmul::tinfo_static;
}
ncmul::ncmul(std::auto_ptr<exvector> vp) : inherited(vp)
{
- tinfo_key = TINFO_ncmul;
+ tinfo_key = &ncmul::tinfo_static;
}
//////////
return inherited::info(inf);
}
-typedef std::vector<int> intvector;
+typedef std::vector<std::size_t> uintvector;
ex ncmul::expand(unsigned options) const
{
// Now, look for all the factors that are sums and remember their
// position and number of terms.
- intvector positions_of_adds(expanded_seq.size());
- intvector number_of_add_operands(expanded_seq.size());
+ uintvector positions_of_adds(expanded_seq.size());
+ uintvector number_of_add_operands(expanded_seq.size());
size_t number_of_adds = 0;
size_t number_of_expanded_terms = 1;
exvector distrseq;
distrseq.reserve(number_of_expanded_terms);
- intvector k(number_of_adds);
+ uintvector k(number_of_adds);
/* Rename indices in the static members of the product */
exvector expanded_seq_mod;
size_t j = 0;
- size_t i;
- for (i=0; i<expanded_seq.size(); i++) {
+ exvector va;
+
+ for (size_t i=0; i<expanded_seq.size(); i++) {
if (i == positions_of_adds[j]) {
expanded_seq_mod.push_back(_ex1);
j++;
} else {
- expanded_seq_mod.push_back(rename_dummy_indices_uniquely(ncmul(expanded_seq_mod), expanded_seq[i]));
+ expanded_seq_mod.push_back(rename_dummy_indices_uniquely(va, expanded_seq[i], true));
}
}
while (true) {
exvector term = expanded_seq_mod;
- for (i=0; i<number_of_adds; i++) {
- term[positions_of_adds[i]] = rename_dummy_indices_uniquely(ncmul(term), expanded_seq[positions_of_adds[i]].op(k[i]));
+ for (size_t i=0; i<number_of_adds; i++) {
+ term[positions_of_adds[i]] = rename_dummy_indices_uniquely(va, expanded_seq[positions_of_adds[i]].op(k[i]), true);
}
distrseq.push_back((new ncmul(term, true))->
exvector assocseq;
assocseq.reserve(factors);
cit = evaledseq.begin();
+ make_flat_inserter mf(evaledseq, true);
while (cit != citend)
- append_factors(assocseq, *cit++);
+ { ex factor = mf.handle_factor(*(cit++), 1);
+ append_factors(assocseq, factor);
+ }
// ncmul(x) -> x
if (assocseq.size()==1) return *(seq.begin());
-
+
// ncmul() -> 1
if (assocseq.empty()) return _ex1;
size_t assoc_num = assocseq.size();
exvectorvector evv;
- unsignedvector rttinfos;
+ std::vector<tinfo_t> rttinfos;
evv.reserve(assoc_num);
rttinfos.reserve(assoc_num);
cit = assocseq.begin(), citend = assocseq.end();
while (cit != citend) {
- unsigned ti = cit->return_type_tinfo();
+ tinfo_t ti = cit->return_type_tinfo();
size_t rtt_num = rttinfos.size();
// search type in vector of known types
for (i=0; i<rtt_num; ++i) {
- if (ti == rttinfos[i]) {
+ if(ti == rttinfos[i]) {
evv[i].push_back(*cit);
break;
}
#endif // def DO_GINAC_ASSERT
// if all elements are of same type, simplify the string
- if (evv_num == 1)
+ if (evv_num == 1) {
return evv[0][0].eval_ncmul(evv[0]);
+ }
exvector splitseq;
splitseq.reserve(evv_num);
return exprseq::conjugate();
}
- if ((return_type_tinfo() & 0xffffff00U) != TINFO_clifford) {
+ if (!is_clifford_tinfo(return_type_tinfo())) {
return exprseq::conjugate();
}
return (new ncmul(ev, true))->setflag(status_flags::dynallocated).eval();
}
+ex ncmul::real_part() const
+{
+ return basic::real_part();
+}
+
+ex ncmul::imag_part() const
+{
+ return basic::imag_part();
+}
+
// protected
/** Implementation of ex::diff() for a non-commutative product. It applies
}
if ((rt == return_types::noncommutative) && (!all_commutative)) {
// another nc element found, compare type_infos
- if (noncommutative_element->return_type_tinfo() != i->return_type_tinfo()) {
- // diffent types -> mul is ncc
- return return_types::noncommutative_composite;
- }
+ if(noncommutative_element->return_type_tinfo() != i->return_type_tinfo())
+ return return_types::noncommutative_composite;
}
++i;
}
return all_commutative ? return_types::commutative : return_types::noncommutative;
}
-unsigned ncmul::return_type_tinfo() const
+tinfo_t ncmul::return_type_tinfo() const
{
if (seq.empty())
- return tinfo_key;
+ return this;
// return type_info of first noncommutative element
exvector::const_iterator i = seq.begin(), end = seq.end();
}
// no noncommutative element found, should not happen
- return tinfo_key;
+ return this;
}
//////////
git://www.ginac.de / ginac.git / blobdiff