Replace use of NULL by C++11 nullptr.

[ginac.git] / ginac / symmetry.cpp

diff --git a/ginac/symmetry.cpp b/ginac/symmetry.cpp
index 1de84e644dd9d95737c3a0812dd544225f9f9d7b..71932ffa0362b72bb4275a326cd0030e53a6f2a5 100644 (file)
--- a/ginac/symmetry.cpp
+++ b/ginac/symmetry.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's symmetry definitions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2009 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
@@ -22,10 +22,12 @@
 
 #include "symmetry.h"
 #include "lst.h"
+#include "add.h"
 #include "numeric.h" // for factorial()
 #include "operators.h"
 #include "archive.h"
 #include "utils.h"
+#include "hash_seed.h"
 
 #include <functional>
 #include <iostream>
@@ -159,7 +161,7 @@ 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;
+       typedef std::set<unsigned>::const_iterator set_it;
        set_it end = indices.end();
        for (set_it i=indices.begin(),j=othersymm.indices.begin(); i!=end; ++i,++j) {
                if(*i < *j)
@@ -185,12 +187,12 @@ int symmetry::compare_same_type(const basic & other) const
 
 unsigned symmetry::calchash() const
 {
-       const void* this_tinfo = (const void*)typeid(*this).name();
-       unsigned v = golden_ratio_hash((p_int)this_tinfo);
+       unsigned v = make_hash_seed(typeid(*this));
 
        if (type == none) {
                v = rotate_left(v);
-               v ^= *(indices.begin());
+               if (!indices.empty())
+                       v ^= *(indices.begin());
        } else {
                for (exvector::const_iterator i=children.begin(); i!=children.end(); ++i)
                {
@@ -268,6 +270,18 @@ 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 (exvector::const_iterator i=children.begin(); i!=children.end(); ++i)
+               if (ex_to<symmetry>(*i).has_nonsymmetric())
+                       return true;
+
+       return false;
+}
+
 bool symmetry::has_cyclic() const
 {
        if (type == cyclic)
@@ -490,11 +504,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++)
@@ -504,8 +519,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 = (new add(sum_v))->setflag(status_flags::dynallocated);
 
        delete[] iv;
        delete[] iv2;