]> www.ginac.de Git - ginac.git/blobdiff - ginac/symmetry.cpp
* Oops, forgot to cvs add the two new files in last commit.
[ginac.git] / ginac / symmetry.cpp
index 536d1cd5115c31edf125ce83693afdd4792dd667..6cf5aaeac223a109f6280c8044bbd7cc68142748 100644 (file)
 #include "symmetry.h"
 #include "lst.h"
 #include "numeric.h" // for factorial()
-#include "print.h"
+#include "operators.h"
 #include "archive.h"
 #include "utils.h"
 
 namespace GiNaC {
 
-GINAC_IMPLEMENT_REGISTERED_CLASS(symmetry, basic)
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(symmetry, basic,
+  print_func<print_context>(&symmetry::do_print).
+  print_func<print_tree>(&symmetry::do_print_tree))
 
 /*
    Some notes about the structure of a symmetry tree:
@@ -50,7 +52,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS(symmetry, basic)
 */
 
 //////////
-// default ctor, dtor, copy ctor, assignment operator and helpers
+// default constructor
 //////////
 
 symmetry::symmetry() : type(none)
@@ -58,16 +60,6 @@ symmetry::symmetry() : type(none)
        tinfo_key = TINFO_symmetry;
 }
 
-void symmetry::copy(const symmetry & other)
-{
-       inherited::copy(other);
-       type = other.type;
-       indices = other.indices;
-       children = other.children;
-}
-
-DEFAULT_DESTROY(symmetry)
-
 //////////
 // other constructors
 //////////
@@ -89,7 +81,7 @@ symmetry::symmetry(symmetry_type t, const symmetry &c1, const symmetry &c2) : ty
 //////////
 
 /** Construct object from archive_node. */
-symmetry::symmetry(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
+symmetry::symmetry(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
 {
        unsigned t;
        if (!(n.find_unsigned("type", t)))
@@ -155,63 +147,60 @@ int symmetry::compare_same_type(const basic & other) const
        return 0;
 }
 
-void symmetry::print(const print_context & c, unsigned level) const
+void symmetry::do_print(const print_context & c, unsigned level) const
 {
-       if (is_a<print_tree>(c)) {
-
-               c.s << std::string(level, ' ') << class_name()
-                   << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
-                   << ", type=";
-
+       if (children.empty()) {
+               if (indices.size() > 0)
+                       c.s << *(indices.begin());
+               else
+                       c.s << "none";
+       } else {
                switch (type) {
-                       case none: c.s << "none"; break;
-                       case symmetric: c.s << "symm"; break;
-                       case antisymmetric: c.s << "anti"; break;
-                       case cyclic: c.s << "cycl"; break;
-                       default: c.s << "<unknown>"; break;
+                       case none: c.s << '!'; break;
+                       case symmetric: c.s << '+'; break;
+                       case antisymmetric: c.s << '-'; break;
+                       case cyclic: c.s << '@'; break;
+                       default: c.s << '?'; break;
                }
-
-               c.s << ", indices=(";
-               if (!indices.empty()) {
-                       std::set<unsigned>::const_iterator i = indices.begin(), end = indices.end();
-                       --end;
-                       while (i != end)
-                               c.s << *i++ << ",";
-                       c.s << *i;
+               c.s << '(';
+               size_t num = children.size();
+               for (size_t i=0; i<num; i++) {
+                       children[i].print(c);
+                       if (i != num - 1)
+                               c.s << ",";
                }
-               c.s << ")\n";
+               c.s << ')';
+       }
+}
 
-               unsigned delta_indent = static_cast<const print_tree &>(c).delta_indent;
-               exvector::const_iterator i = children.begin(), end = children.end();
-               while (i != end) {
-                       i->print(c, level + delta_indent);
-                       ++i;
-               }
+void symmetry::do_print_tree(const print_tree & c, unsigned level) const
+{
+       c.s << std::string(level, ' ') << class_name() << " @" << this
+           << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
+           << ", type=";
+
+       switch (type) {
+               case none: c.s << "none"; break;
+               case symmetric: c.s << "symm"; break;
+               case antisymmetric: c.s << "anti"; break;
+               case cyclic: c.s << "cycl"; break;
+               default: c.s << "<unknown>"; break;
+       }
 
-       } else {
+       c.s << ", indices=(";
+       if (!indices.empty()) {
+               std::set<unsigned>::const_iterator i = indices.begin(), end = indices.end();
+               --end;
+               while (i != end)
+                       c.s << *i++ << ",";
+               c.s << *i;
+       }
+       c.s << ")\n";
 
-               if (children.empty()) {
-                       if (indices.size() > 0)
-                               c.s << *(indices.begin());
-                       else
-                               c.s << "none";
-               } else {
-                       switch (type) {
-                               case none: c.s << '!'; break;
-                               case symmetric: c.s << '+'; break;
-                               case antisymmetric: c.s << '-'; break;
-                               case cyclic: c.s << '@'; break;
-                               default: c.s << '?'; break;
-                       }
-                       c.s << '(';
-                       unsigned num = children.size();
-                       for (unsigned i=0; i<num; i++) {
-                               children[i].print(c);
-                               if (i != num - 1)
-                                       c.s << ",";
-                       }
-                       c.s << ')';
-               }
+       exvector::const_iterator i = children.begin(), end = children.end();
+       while (i != end) {
+               i->print(c, level + c.delta_indent);
+               ++i;
        }
 }
 
@@ -356,10 +345,8 @@ static ex symm(const ex & e, exvector::const_iterator first, exvector::const_ite
        if (num < 2)
                return e;
 
-       // Transform object vector to a list
-       exlist iv_lst;
-       iv_lst.insert(iv_lst.begin(), first, last);
-       lst orig_lst(iv_lst, true);
+       // Transform object vector to a lst (for subs())
+       lst orig_lst(first, last);
 
        // Create index vectors for permutation
        unsigned *iv = new unsigned[num], *iv2;
@@ -374,7 +361,7 @@ static ex symm(const ex & e, exvector::const_iterator first, exvector::const_ite
                lst new_lst;
                for (unsigned i=0; i<num; i++)
                        new_lst.append(orig_lst.op(iv[i]));
-               ex term = e.subs(orig_lst, new_lst);
+               ex term = e.subs(orig_lst, new_lst, subs_options::no_pattern);
                if (asymmetric) {
                        memcpy(iv2, iv, num * sizeof(unsigned));
                        term *= permutation_sign(iv2, iv2 + num);
@@ -405,10 +392,8 @@ ex symmetrize_cyclic(const ex & e, exvector::const_iterator first, exvector::con
        if (num < 2)
                return e;
 
-       // Transform object vector to a list
-       exlist iv_lst;
-       iv_lst.insert(iv_lst.begin(), first, last);
-       lst orig_lst(iv_lst, true);
+       // Transform object vector to a lst (for subs())
+       lst orig_lst(first, last);
        lst new_lst = orig_lst;
 
        // Loop over all cyclic permutations (the first permutation, which is
@@ -417,7 +402,7 @@ ex symmetrize_cyclic(const ex & e, exvector::const_iterator first, exvector::con
        for (unsigned i=0; i<num-1; i++) {
                ex perm = new_lst.op(0);
                new_lst.remove_first().append(perm);
-               sum += e.subs(orig_lst, new_lst);
+               sum += e.subs(orig_lst, new_lst, subs_options::no_pattern);
        }
        return sum / num;
 }
@@ -425,20 +410,14 @@ ex symmetrize_cyclic(const ex & e, exvector::const_iterator first, exvector::con
 /** Symmetrize expression over a list of objects (symbols, indices). */
 ex ex::symmetrize(const lst & l) const
 {
-       exvector v;
-       v.reserve(l.nops());
-       for (unsigned i=0; i<l.nops(); i++)
-               v.push_back(l.op(i));
+       exvector v(l.begin(), l.end());
        return symm(*this, v.begin(), v.end(), false);
 }
 
 /** Antisymmetrize expression over a list of objects (symbols, indices). */
 ex ex::antisymmetrize(const lst & l) const
 {
-       exvector v;
-       v.reserve(l.nops());
-       for (unsigned i=0; i<l.nops(); i++)
-               v.push_back(l.op(i));
+       exvector v(l.begin(), l.end());
        return symm(*this, v.begin(), v.end(), true);
 }
 
@@ -446,10 +425,7 @@ ex ex::antisymmetrize(const lst & l) const
  *  (symbols, indices). */
 ex ex::symmetrize_cyclic(const lst & l) const
 {
-       exvector v;
-       v.reserve(l.nops());
-       for (unsigned i=0; i<l.nops(); i++)
-               v.push_back(l.op(i));
+       exvector v(l.begin(), l.end());
        return GiNaC::symmetrize_cyclic(*this, v.begin(), v.end());
 }