Happy New Year!
[ginac.git] / ginac / symmetry.cpp
index 725506f..115df0b 100644 (file)
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's symmetry definitions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2009 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2019 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
@@ -22,6 +22,7 @@
 
 #include "symmetry.h"
 #include "lst.h"
+#include "add.h"
 #include "numeric.h" // for factorial()
 #include "operators.h"
 #include "archive.h"
@@ -122,16 +123,12 @@ void symmetry::archive(archive_node &n) const
        n.add_unsigned("type", type);
 
        if (children.empty()) {
-               std::set<unsigned>::const_iterator i = indices.begin(), iend = indices.end();
-               while (i != iend) {
-                       n.add_unsigned("index", *i);
-                       i++;
+               for (auto & i : indices) {
+                       n.add_unsigned("index", i);
                }
        } else {
-               exvector::const_iterator i = children.begin(), iend = children.end();
-               while (i != iend) {
-                       n.add_ex("child", *i);
-                       i++;
+               for (auto & i : children) {
+                       n.add_ex("child", i);
                }
        }
 }
@@ -160,9 +157,8 @@ int symmetry::compare_same_type(const basic & other) const
                return 1;
        if (this_size < that_size)
                return -1;
-       typedef std::set<unsigned>::iterator set_it;
-       set_it end = indices.end();
-       for (set_it i=indices.begin(),j=othersymm.indices.begin(); i!=end; ++i,++j) {
+       auto end = indices.end();
+       for (auto i=indices.begin(),j=othersymm.indices.begin(); i!=end; ++i,++j) {
                if(*i < *j)
                        return 1;
                if(*i > *j)
@@ -193,10 +189,9 @@ unsigned symmetry::calchash() const
                if (!indices.empty())
                        v ^= *(indices.begin());
        } else {
-               for (exvector::const_iterator i=children.begin(); i!=children.end(); ++i)
-               {
+               for (auto & i : children) {
                        v = rotate_left(v);
-                       v ^= i->gethash();
+                       v ^= i.gethash();
                }
        }
 
@@ -250,7 +245,7 @@ void symmetry::do_print_tree(const print_tree & c, unsigned level) const
 
        c.s << ", indices=(";
        if (!indices.empty()) {
-               std::set<unsigned>::const_iterator i = indices.begin(), end = indices.end();
+               auto i = indices.begin(), end = indices.end();
                --end;
                while (i != end)
                        c.s << *i++ << ",";
@@ -258,10 +253,8 @@ void symmetry::do_print_tree(const print_tree & c, unsigned level) const
        }
        c.s << ")\n";
 
-       exvector::const_iterator i = children.begin(), end = children.end();
-       while (i != end) {
-               i->print(c, level + c.delta_indent);
-               ++i;
+       for (auto & i : children) {
+               i.print(c, level + c.delta_indent);
        }
 }
 
@@ -269,13 +262,25 @@ void symmetry::do_print_tree(const print_tree & c, unsigned level) const
 // non-virtual functions in this class
 //////////
 
+bool symmetry::has_nonsymmetric() const
+{
+       if (type == antisymmetric || type == cyclic)
+               return true;
+
+       for (auto & i : children)
+               if (ex_to<symmetry>(i).has_nonsymmetric())
+                       return true;
+
+       return false;
+}
+
 bool symmetry::has_cyclic() const
 {
        if (type == cyclic)
                return true;
 
-       for (exvector::const_iterator i=children.begin(); i!=children.end(); ++i)
-               if (ex_to<symmetry>(*i).has_cyclic())
+       for (auto & i : children)
+               if (ex_to<symmetry>(i).has_cyclic())
                        return true;
 
        return false;
@@ -320,71 +325,71 @@ void symmetry::validate(unsigned n)
 
 static const symmetry & index0()
 {
-       static ex s = (new symmetry(0))->setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>(0);
        return ex_to<symmetry>(s);
 }
 
 static const symmetry & index1()
 {
-       static ex s = (new symmetry(1))->setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>(1);
        return ex_to<symmetry>(s);
 }
 
 static const symmetry & index2()
 {
-       static ex s = (new symmetry(2))->setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>(2);
        return ex_to<symmetry>(s);
 }
 
 static const symmetry & index3()
 {
-       static ex s = (new symmetry(3))->setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>(3);
        return ex_to<symmetry>(s);
 }
 
 const symmetry & not_symmetric()
 {
-       static ex s = (new symmetry)->setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>();
        return ex_to<symmetry>(s);
 }
 
 const symmetry & symmetric2()
 {
-       static ex s = (new symmetry(symmetry::symmetric, index0(), index1()))->setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>(symmetry::symmetric, index0(), index1());
        return ex_to<symmetry>(s);
 }
 
 const symmetry & symmetric3()
 {
-       static ex s = (new symmetry(symmetry::symmetric, index0(), index1()))->add(index2()).setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>(symmetry::symmetric, index0(), index1()).add(index2());
        return ex_to<symmetry>(s);
 }
 
 const symmetry & symmetric4()
 {
-       static ex s = (new symmetry(symmetry::symmetric, index0(), index1()))->add(index2()).add(index3()).setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>(symmetry::symmetric, index0(), index1()).add(index2()).add(index3());
        return ex_to<symmetry>(s);
 }
 
 const symmetry & antisymmetric2()
 {
-       static ex s = (new symmetry(symmetry::antisymmetric, index0(), index1()))->setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>(symmetry::antisymmetric, index0(), index1());
        return ex_to<symmetry>(s);
 }
 
 const symmetry & antisymmetric3()
 {
-       static ex s = (new symmetry(symmetry::antisymmetric, index0(), index1()))->add(index2()).setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>(symmetry::antisymmetric, index0(), index1()).add(index2());
        return ex_to<symmetry>(s);
 }
 
 const symmetry & antisymmetric4()
 {
-       static ex s = (new symmetry(symmetry::antisymmetric, index0(), index1()))->add(index2()).add(index3()).setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>(symmetry::antisymmetric, index0(), index1()).add(index2()).add(index3());
        return ex_to<symmetry>(s);
 }
 
-class sy_is_less : public std::binary_function<ex, ex, bool> {
+class sy_is_less {
        exvector::iterator v;
 
 public:
@@ -395,7 +400,7 @@ public:
                GINAC_ASSERT(is_exactly_a<symmetry>(lh));
                GINAC_ASSERT(is_exactly_a<symmetry>(rh));
                GINAC_ASSERT(ex_to<symmetry>(lh).indices.size() == ex_to<symmetry>(rh).indices.size());
-               std::set<unsigned>::const_iterator ait = ex_to<symmetry>(lh).indices.begin(), aitend = ex_to<symmetry>(lh).indices.end(), bit = ex_to<symmetry>(rh).indices.begin();
+               auto ait = ex_to<symmetry>(lh).indices.begin(), aitend = ex_to<symmetry>(lh).indices.end(), bit = ex_to<symmetry>(rh).indices.begin();
                while (ait != aitend) {
                        int cmpval = v[*ait].compare(v[*bit]);
                        if (cmpval < 0)
@@ -408,7 +413,7 @@ public:
        }
 };
 
-class sy_swap : public std::binary_function<ex, ex, void> {
+class sy_swap {
        exvector::iterator v;
 
 public:
@@ -421,7 +426,7 @@ public:
                GINAC_ASSERT(is_exactly_a<symmetry>(lh));
                GINAC_ASSERT(is_exactly_a<symmetry>(rh));
                GINAC_ASSERT(ex_to<symmetry>(lh).indices.size() == ex_to<symmetry>(rh).indices.size());
-               std::set<unsigned>::const_iterator ait = ex_to<symmetry>(lh).indices.begin(), aitend = ex_to<symmetry>(lh).indices.end(), bit = ex_to<symmetry>(rh).indices.begin();
+               auto ait = ex_to<symmetry>(lh).indices.begin(), aitend = ex_to<symmetry>(lh).indices.end(), bit = ex_to<symmetry>(rh).indices.begin();
                while (ait != aitend) {
                        v[*ait].swap(v[*bit]);
                        ++ait; ++bit;
@@ -439,7 +444,7 @@ int canonicalize(exvector::iterator v, const symmetry &symm)
        // Canonicalize children first
        bool something_changed = false;
        int sign = 1;
-       exvector::const_iterator first = symm.children.begin(), last = symm.children.end();
+       auto first = symm.children.begin(), last = symm.children.end();
        while (first != last) {
                GINAC_ASSERT(is_exactly_a<symmetry>(*first));
                int child_sign = canonicalize(v, ex_to<symmetry>(*first));
@@ -491,11 +496,12 @@ static ex symm(const ex & e, exvector::const_iterator first, exvector::const_ite
        unsigned *iv = new unsigned[num], *iv2;
        for (unsigned i=0; i<num; i++)
                iv[i] = i;
-       iv2 = (asymmetric ? new unsigned[num] : NULL);
+       iv2 = (asymmetric ? new unsigned[num] : nullptr);
 
        // Loop over all permutations (the first permutation, which is the
        // identity, is unrolled)
-       ex sum = e;
+       exvector sum_v;
+       sum_v.push_back(e);
        while (std::next_permutation(iv, iv + num)) {
                lst new_lst;
                for (unsigned i=0; i<num; i++)
@@ -505,8 +511,9 @@ static ex symm(const ex & e, exvector::const_iterator first, exvector::const_ite
                        memcpy(iv2, iv, num * sizeof(unsigned));
                        term *= permutation_sign(iv2, iv2 + num);
                }
-               sum += term;
+               sum_v.push_back(term);
        }
+       ex sum = dynallocate<add>(sum_v);
 
        delete[] iv;
        delete[] iv2;