X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fclifford.cpp;h=f50062695232401a51205eb128c44223956eebae;hp=2d1e40d3c567aa6afb29863e380188f3f9d4bc34;hb=f8b3c08fd7a5aabe7471c4dfb635d134ee4d8ef3;hpb=286b0d93528e35957a50c51343e0b4a9bc623bce diff --git a/ginac/clifford.cpp b/ginac/clifford.cpp index 2d1e40d3..f5006269 100644 --- a/ginac/clifford.cpp +++ b/ginac/clifford.cpp @@ -3,7 +3,7 @@ * Implementation of GiNaC's clifford algebra (Dirac gamma) objects. */ /* - * GiNaC Copyright (C) 1999-2011 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2015 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 @@ -102,14 +102,14 @@ clifford::clifford(const ex & b, unsigned char rl) : inherited(b), representatio * @see dirac_gamma */ clifford::clifford(const ex & b, const ex & mu, const ex & metr, unsigned char rl, int comm_sign) : inherited(b, mu), representation_label(rl), metric(metr), commutator_sign(comm_sign) { - GINAC_ASSERT(is_a(mu)); + GINAC_ASSERT(is_a(mu)); } -clifford::clifford(unsigned char rl, const ex & metr, int comm_sign, const exvector & v, bool discardable) : inherited(not_symmetric(), v, discardable), representation_label(rl), metric(metr), commutator_sign(comm_sign) +clifford::clifford(unsigned char rl, const ex & metr, int comm_sign, const exvector & v) : inherited(not_symmetric(), v), representation_label(rl), metric(metr), commutator_sign(comm_sign) { } -clifford::clifford(unsigned char rl, const ex & metr, int comm_sign, std::auto_ptr vp) : inherited(not_symmetric(), vp), representation_label(rl), metric(metr), commutator_sign(comm_sign) +clifford::clifford(unsigned char rl, const ex & metr, int comm_sign, exvector && v) : inherited(not_symmetric(), std::move(v)), representation_label(rl), metric(metr), commutator_sign(comm_sign) { } @@ -142,6 +142,7 @@ void clifford::archive(archive_node & n) const } GINAC_BIND_UNARCHIVER(clifford); +GINAC_BIND_UNARCHIVER(cliffordunit); GINAC_BIND_UNARCHIVER(diracone); GINAC_BIND_UNARCHIVER(diracgamma); GINAC_BIND_UNARCHIVER(diracgamma5); @@ -160,15 +161,15 @@ ex clifford::get_metric(const ex & i, const ex & j, bool symmetrised) const return simplify_indexed(indexed(metric.op(0)*_ex1_2, i, j) + indexed(metric.op(0)*_ex1_2, j, i)); } } else { - return metric.subs(lst(metric.op(1) == i, metric.op(2) == j), subs_options::no_pattern); + return metric.subs(lst{metric.op(1) == i, metric.op(2) == j}, subs_options::no_pattern); } } else { exvector indices = metric.get_free_indices(); if (symmetrised) - return _ex1_2*simplify_indexed(metric.subs(lst(indices[0] == i, indices[1] == j), subs_options::no_pattern) - + metric.subs(lst(indices[0] == j, indices[1] == i), subs_options::no_pattern)); + return _ex1_2*simplify_indexed(metric.subs(lst{indices[0] == i, indices[1] == j}, subs_options::no_pattern) + + metric.subs(lst{indices[0] == j, indices[1] == i}, subs_options::no_pattern)); else - return metric.subs(lst(indices[0] == i, indices[1] == j), subs_options::no_pattern); + return metric.subs(lst{indices[0] == i, indices[1] == j}, subs_options::no_pattern); } } @@ -207,7 +208,7 @@ ex & clifford::let_op(size_t i) GINAC_ASSERT(isetflag(status_flags::dynallocated), ex_to(c.op(1)).get_dim()); + varidx ix(dynallocate(), ex_to(c.op(1)).get_dim()); b = indexed(c.op(0), ix.toggle_variance()); i = ix; } @@ -348,7 +349,7 @@ bool diracgamma::contract_with(exvector::iterator self, exvector::iterator other if (is_a(*other)) { - // Contraction only makes sense if the represenation labels are equal + // Contraction only makes sense if the representation labels are equal if (ex_to(*other).get_representation_label() != rl) return false; @@ -398,7 +399,7 @@ bool diracgamma::contract_with(exvector::iterator self, exvector::iterator other if (std::find_if(self + 1, other, is_not_a_clifford()) != other) return false; - *self = ncmul(exvector(std::reverse_iterator(other), std::reverse_iterator(self + 1)), true); + *self = ncmul(exvector(std::reverse_iterator(other), std::reverse_iterator(self + 1))); std::fill(self + 1, other, _ex1); *other = _ex_2; return true; @@ -411,8 +412,8 @@ bool diracgamma::contract_with(exvector::iterator self, exvector::iterator other return false; exvector::iterator next_to_last = other - 1; - ex S = ncmul(exvector(self + 1, next_to_last), true); - ex SR = ncmul(exvector(std::reverse_iterator(next_to_last), std::reverse_iterator(self + 1)), true); + ex S = ncmul(exvector(self + 1, next_to_last)); + ex SR = ncmul(exvector(std::reverse_iterator(next_to_last), std::reverse_iterator(self + 1))); *self = (*next_to_last) * S + SR * (*next_to_last); std::fill(self + 1, other, _ex1); @@ -427,7 +428,7 @@ bool diracgamma::contract_with(exvector::iterator self, exvector::iterator other return false; exvector::iterator next_to_last = other - 1; - ex S = ncmul(exvector(self + 1, next_to_last), true); + ex S = ncmul(exvector(self + 1, next_to_last)); *self = 2 * (*next_to_last) * S - (*self) * S * (*other) * (*next_to_last); std::fill(self + 1, other + 1, _ex1); @@ -455,7 +456,7 @@ bool cliffordunit::contract_with(exvector::iterator self, exvector::iterator oth unsigned char rl = unit.get_representation_label(); if (is_a(*other)) { - // Contraction only makes sense if the represenation labels are equal + // Contraction only makes sense if the representation labels are equal // and the metrics are the same if ((ex_to(*other).get_representation_label() != rl) && unit.same_metric(*other)) @@ -494,7 +495,7 @@ bool cliffordunit::contract_with(exvector::iterator self, exvector::iterator oth return false; } - ex S = ncmul(exvector(self + 1, before_other), true); + ex S = ncmul(exvector(self + 1, before_other)); if (is_a(*before_other) && ex_to(*before_other).get_representation_label() == rl) { *self = 2 * (*self) * S * unit.get_metric(alpha, mu_toggle, true) - (*self) * S * (*other) * (*before_other); @@ -519,11 +520,9 @@ ex clifford::eval_ncmul(const exvector & v) const s.reserve(v.size()); // Remove superfluous ONEs - exvector::const_iterator cit = v.begin(), citend = v.end(); - while (cit != citend) { - if (!is_a(*cit) || !is_a(cit->op(0))) - s.push_back(*cit); - cit++; + for (auto & it : v) { + if (!is_a(it) || !is_a(it.op(0))) + s.push_back(it); } bool something_changed = false; @@ -662,7 +661,7 @@ ex clifford::eval_ncmul(const exvector & v) const } else if (!a_is_cliffordunit && !b_is_cliffordunit && ag.is_equal(bg)) { // a\ a\ -> a^2 - varidx ix((new symbol)->setflag(status_flags::dynallocated), ex_to(a.op(1)).minimal_dim(ex_to(b.op(1)))); + varidx ix(dynallocate(), ex_to(a.op(1)).minimal_dim(ex_to(b.op(1)))); a = indexed(ag, ix) * indexed(ag, ix.toggle_variance()); b = dirac_ONE(representation_label); @@ -684,9 +683,9 @@ ex clifford::thiscontainer(const exvector & v) const return clifford(representation_label, metric, commutator_sign, v); } -ex clifford::thiscontainer(std::auto_ptr vp) const +ex clifford::thiscontainer(exvector && v) const { - return clifford(representation_label, metric, commutator_sign, vp); + return clifford(representation_label, metric, commutator_sign, std::move(v)); } ex diracgamma5::conjugate() const @@ -696,12 +695,12 @@ ex diracgamma5::conjugate() const ex diracgammaL::conjugate() const { - return (new diracgammaR)->setflag(status_flags::dynallocated); + return dynallocate(); } ex diracgammaR::conjugate() const { - return (new diracgammaL)->setflag(status_flags::dynallocated); + return dynallocate(); } ////////// @@ -710,7 +709,7 @@ ex diracgammaR::conjugate() const ex dirac_ONE(unsigned char rl) { - static ex ONE = (new diracone)->setflag(status_flags::dynallocated); + static ex ONE = dynallocate(); return clifford(ONE, rl); } @@ -727,8 +726,7 @@ static unsigned get_dim_uint(const ex& e) ex clifford_unit(const ex & mu, const ex & metr, unsigned char rl) { - //static ex unit = (new cliffordunit)->setflag(status_flags::dynallocated); - ex unit = (new cliffordunit)->setflag(status_flags::dynallocated); + ex unit = dynallocate(); if (!is_a(mu)) throw(std::invalid_argument("clifford_unit(): index of Clifford unit must be of type idx or varidx")); @@ -742,10 +740,10 @@ ex clifford_unit(const ex & mu, const ex & metr, unsigned char rl) unsigned n = M.rows(); bool symmetric = true; - //static idx xi((new symbol)->setflag(status_flags::dynallocated), n), - // chi((new symbol)->setflag(status_flags::dynallocated), n); - idx xi((new symbol)->setflag(status_flags::dynallocated), n), - chi((new symbol)->setflag(status_flags::dynallocated), n); + //static idx xi(dynallocate(), n), + // chi(dynallocate(), n); + idx xi(dynallocate(), n), + chi(dynallocate(), n); if ((n == M.cols()) && (n == get_dim_uint(mu))) { for (unsigned i = 0; i < n; i++) { for (unsigned j = i+1; j < n; j++) { @@ -759,10 +757,10 @@ ex clifford_unit(const ex & mu, const ex & metr, unsigned char rl) throw(std::invalid_argument("clifford_unit(): metric for Clifford unit must be a square matrix with the same dimensions as index")); } } else if (indices.size() == 0) { // a tensor or other expression without indices - //static varidx xi((new symbol)->setflag(status_flags::dynallocated), ex_to(mu).get_dim()), - // chi((new symbol)->setflag(status_flags::dynallocated), ex_to(mu).get_dim()); - varidx xi((new symbol)->setflag(status_flags::dynallocated), ex_to(mu).get_dim()), - chi((new symbol)->setflag(status_flags::dynallocated), ex_to(mu).get_dim()); + //static varidx xi(dynallocate(), ex_to(mu).get_dim()), + // chi(dynallocate(), ex_to(mu).get_dim()); + varidx xi(dynallocate(), ex_to(mu).get_dim()), + chi(dynallocate(), ex_to(mu).get_dim()); return clifford(unit, mu, indexed(metr, xi, chi), rl); } else throw(std::invalid_argument("clifford_unit(): metric for Clifford unit must be of type tensor, matrix or an expression with two free indices")); @@ -770,31 +768,31 @@ ex clifford_unit(const ex & mu, const ex & metr, unsigned char rl) ex dirac_gamma(const ex & mu, unsigned char rl) { - static ex gamma = (new diracgamma)->setflag(status_flags::dynallocated); + static ex gamma = dynallocate(); if (!is_a(mu)) throw(std::invalid_argument("dirac_gamma(): index of Dirac gamma must be of type varidx")); - static varidx xi((new symbol)->setflag(status_flags::dynallocated), ex_to(mu).get_dim()), - chi((new symbol)->setflag(status_flags::dynallocated), ex_to(mu).get_dim()); - return clifford(gamma, mu, indexed((new minkmetric)->setflag(status_flags::dynallocated), symmetric2(), xi, chi), rl); + static varidx xi(dynallocate(), ex_to(mu).get_dim()), + chi(dynallocate(), ex_to(mu).get_dim()); + return clifford(gamma, mu, indexed(dynallocate(), symmetric2(), xi, chi), rl); } ex dirac_gamma5(unsigned char rl) { - static ex gamma5 = (new diracgamma5)->setflag(status_flags::dynallocated); + static ex gamma5 = dynallocate(); return clifford(gamma5, rl); } ex dirac_gammaL(unsigned char rl) { - static ex gammaL = (new diracgammaL)->setflag(status_flags::dynallocated); + static ex gammaL = dynallocate(); return clifford(gammaL, rl); } ex dirac_gammaR(unsigned char rl) { - static ex gammaR = (new diracgammaR)->setflag(status_flags::dynallocated); + static ex gammaR = dynallocate(); return clifford(gammaR, rl); } @@ -804,9 +802,9 @@ ex dirac_slash(const ex & e, const ex & dim, unsigned char rl) // vector as its base expression and a (dummy) index that just serves // for storing the space dimensionality - static varidx xi((new symbol)->setflag(status_flags::dynallocated), dim), - chi((new symbol)->setflag(status_flags::dynallocated), dim); - return clifford(e, varidx(0, dim), indexed((new minkmetric)->setflag(status_flags::dynallocated), symmetric2(), xi, chi), rl); + static varidx xi(dynallocate(), dim), + chi(dynallocate(), dim); + return clifford(e, varidx(0, dim), indexed(dynallocate(), symmetric2(), xi, chi), rl); } /** Extract representation label from tinfo key (as returned by @@ -893,10 +891,10 @@ ex dirac_trace(const ex & e, const std::set & rls, const ex & trO return e; // Substitute gammaL/R and expand product, if necessary - ex e_expanded = e.subs(lst( + ex e_expanded = e.subs(lst{ dirac_gammaL(rl) == (dirac_ONE(rl)-dirac_gamma5(rl))/2, dirac_gammaR(rl) == (dirac_ONE(rl)+dirac_gamma5(rl))/2 - ), subs_options::no_pattern).expand(); + }, subs_options::no_pattern).expand(); if (!is_a(e_expanded)) return dirac_trace(e_expanded, rls, trONE); @@ -922,7 +920,7 @@ ex dirac_trace(const ex & e, const std::set & rls, const ex & trO return trONE * I * (lorentz_eps(ex_to(i1).replace_dim(_ex4), ex_to(i2).replace_dim(_ex4), ex_to(i3).replace_dim(_ex4), ex_to(i4).replace_dim(_ex4)) * b1 * b2 * b3 * b4).simplify_indexed(); } - // Tr gamma5 S_2k = + // Tr gamma5 S_2k = // I/4! * epsilon0123.mu1.mu2.mu3.mu4 * Tr gamma.mu1 gamma.mu2 gamma.mu3 gamma.mu4 S_2k // (the epsilon is always 4-dimensional) exvector ix(num-1), bv(num-1); @@ -1064,7 +1062,7 @@ ex canonicalize_clifford(const ex & e_) ex sum = ncmul(v); it[0] = save1; it[1] = save0; - sum += ex_to(save0).get_commutator_sign() * ncmul(v, true); + sum += ex_to(save0).get_commutator_sign() * ncmul(std::move(v)); i->second = canonicalize_clifford(sum); goto next_sym; } @@ -1132,7 +1130,7 @@ ex remove_dirac_ONE(const ex & e, unsigned char rl, unsigned options) return e1; } -char clifford_max_label(const ex & e, bool ignore_ONE) +int clifford_max_label(const ex & e, bool ignore_ONE) { if (is_a(e)) if (ignore_ONE && is_a(e.op(0))) @@ -1140,7 +1138,7 @@ char clifford_max_label(const ex & e, bool ignore_ONE) else return ex_to(e).get_representation_label(); else { - char rl = -1; + int rl = -1; for (size_t i=0; i < e.nops(); i++) rl = (rl > clifford_max_label(e.op(i), ignore_ONE)) ? rl : clifford_max_label(e.op(i), ignore_ONE); return rl; @@ -1194,7 +1192,7 @@ ex lst_to_clifford(const ex & v, const ex & e) { return v.op(0) * dirac_ONE(ex_to(e).get_representation_label()) + indexed(sub_matrix(ex_to(v), 0, 1, 1, dim), mu_toggle) * e; else return v.op(0) * dirac_ONE(ex_to(e).get_representation_label()) + indexed(sub_matrix(ex_to(v), 1, dim, 0, 1), mu_toggle) * e; - } else + } else throw(std::invalid_argument("lst_to_clifford(): dimensions of vector and clifford unit mismatch")); } else throw(std::invalid_argument("lst_to_clifford(): first argument should be a vector (nx1 or 1xn matrix)")); @@ -1210,7 +1208,7 @@ ex lst_to_clifford(const ex & v, const ex & e) { } else throw(std::invalid_argument("lst_to_clifford(): the second argument should be a Clifford unit")); } - + /** Auxiliary structure to define a function for striping one Clifford unit * from vectors. Used in clifford_to_lst(). */ static ex get_clifford_comp(const ex & e, const ex & c) @@ -1228,8 +1226,7 @@ static ex get_clifford_comp(const ex & e, const ex & c) if (is_a(e.op(j)) && ex_to(c).same_metric(e.op(j))) { if (ind > e.nops()) { ind = j; - } - else { + } else { throw(std::invalid_argument("get_clifford_comp(): expression is a Clifford multi-vector")); } } @@ -1240,24 +1237,25 @@ static ex get_clifford_comp(const ex & e, const ex & c) same_value_index = ( ex_to(e.op(ind).op(1)).is_numeric() && (ival == ex_to(ex_to(e.op(ind).op(1)).get_value()).to_int()) ); found_dummy = same_value_index; + // Run through the expression collecting all non-clifford factors for (size_t j=0; j < e.nops(); j++) { if (j != ind) { if (same_value_index) { S = S * e.op(j); - } - else { - exvector ind_vec = ex_to(e.op(j)).get_dummy_indices(ex_to(e.op(ind))); + } else { + exvector ind_vec; + if (is_a(e.op(j))) + ind_vec = ex_to(e.op(j)).get_dummy_indices(ex_to(e.op(ind))); + if (ind_vec.size() > 0) { found_dummy = true; - exvector::const_iterator it = ind_vec.begin(), itend = ind_vec.end(); - while (it != itend) { - ex curridx = *it; + for (auto & it : ind_vec) { + ex curridx = it; ex curridx_toggle = is_a(curridx) ? ex_to(curridx).toggle_variance() : curridx; - S = S * e.op(j).subs(lst(curridx == ival, - curridx_toggle == ival), subs_options::no_pattern); - ++it; + S = S * e.op(j).subs(lst{curridx == ival, curridx_toggle == ival}, + subs_options::no_pattern); } } else S = S * e.op(j); @@ -1336,11 +1334,11 @@ ex clifford_moebius_map(const ex & a, const ex & b, const ex & c, const ex & d, } else { if (is_a(G)) { D = ex_to(G.op(1)).get_dim(); - varidx mu((new symbol)->setflag(status_flags::dynallocated), D); + varidx mu(dynallocate(), D); cu = clifford_unit(mu, G, rl); } else if (is_a(G)) { D = ex_to(G).rows(); - idx mu((new symbol)->setflag(status_flags::dynallocated), D); + idx mu(dynallocate(), D); cu = clifford_unit(mu, G, rl); } else throw(std::invalid_argument("clifford_moebius_map(): metric should be an indexed object, matrix, or a Clifford unit"));