canonicalize() failed to return zero for an antisymmetric combination of two

[ginac.git] / ginac / symmetry.cpp

diff --git a/ginac/symmetry.cpp b/ginac/symmetry.cpp
index 2312526e67a367df028a1ec1e68f2053f5e4961a..c953953a2e55eebf2ee081a84ab6904658cb7adb 100644 (file)
--- a/ginac/symmetry.cpp
+++ b/ginac/symmetry.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's symmetry definitions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2002 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
@@ -20,9 +20,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <iostream>
 #include <stdexcept>
 #include <functional>
-#include <algorithm>
 
 #include "symmetry.h"
 #include "lst.h"
@@ -30,7 +30,6 @@
 #include "print.h"
 #include "archive.h"
 #include "utils.h"
-#include "debugmsg.h"
 
 namespace GiNaC {
 
@@ -51,12 +50,11 @@ GINAC_IMPLEMENT_REGISTERED_CLASS(symmetry, basic)
 */
 
 //////////
-// default constructor, destructor, copy constructor assignment operator and helpers
+// default ctor, dtor, copy ctor, assignment operator and helpers
 //////////
 
 symmetry::symmetry() : type(none)
 {
-       debugmsg("symmetry default constructor", LOGLEVEL_CONSTRUCT);
        tinfo_key = TINFO_symmetry;
 }
 
@@ -76,14 +74,12 @@ DEFAULT_DESTROY(symmetry)
 
 symmetry::symmetry(unsigned i) : type(none)
 {
-       debugmsg("symmetry constructor from unsigned", LOGLEVEL_CONSTRUCT);
        indices.insert(i);
        tinfo_key = TINFO_symmetry;
 }
 
 symmetry::symmetry(symmetry_type t, const symmetry &c1, const symmetry &c2) : type(t)
 {
-       debugmsg("symmetry constructor from symmetry_type,symmetry &,symmetry &", LOGLEVEL_CONSTRUCT);
        add(c1); add(c2);
        tinfo_key = TINFO_symmetry;
 }
@@ -95,8 +91,6 @@ 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)
 {
-       debugmsg("symmetry ctor from archive_node", LOGLEVEL_CONSTRUCT);
-
        unsigned t;
        if (!(n.find_unsigned("type", t)))
                throw (std::runtime_error("unknown symmetry type in archive"));
@@ -154,7 +148,7 @@ DEFAULT_UNARCHIVE(symmetry)
 
 int symmetry::compare_same_type(const basic & other) const
 {
-       GINAC_ASSERT(is_of_type(other, symmetry));
+       GINAC_ASSERT(is_a<symmetry>(other));
 
        // All symmetry trees are equal. They are not supposed to appear in
        // ordinary expressions anyway...
@@ -163,9 +157,7 @@ int symmetry::compare_same_type(const basic & other) const
 
 void symmetry::print(const print_context & c, unsigned level) const
 {
-       debugmsg("symmetry print", LOGLEVEL_PRINT);
-
-       if (is_of_type(c, print_tree)) {
+       if (is_a<print_tree>(c)) {
 
                c.s << std::string(level, ' ') << class_name()
                    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
@@ -231,7 +223,7 @@ symmetry &symmetry::add(const symmetry &c)
 {
        // All children must have the same number of indices
        if (type != none && !children.empty()) {
-               GINAC_ASSERT(is_ex_exactly_of_type(children[0], symmetry));
+               GINAC_ASSERT(is_exactly_a<symmetry>(children[0]));
                if (ex_to<symmetry>(children[0]).indices.size() != c.indices.size())
                        throw (std::logic_error("symmetry:add(): children must have same number of indices"));
        }
@@ -272,8 +264,8 @@ public:
 
        bool operator() (const ex &lh, const ex &rh) const
        {
-               GINAC_ASSERT(is_ex_exactly_of_type(lh, symmetry));
-               GINAC_ASSERT(is_ex_exactly_of_type(rh, symmetry));
+               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();
                while (ait != aitend) {
@@ -298,8 +290,8 @@ public:
 
        void operator() (const ex &lh, const ex &rh)
        {
-               GINAC_ASSERT(is_ex_exactly_of_type(lh, symmetry));
-               GINAC_ASSERT(is_ex_exactly_of_type(rh, symmetry));
+               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();
                while (ait != aitend) {
@@ -312,7 +304,7 @@ public:
 
 int canonicalize(exvector::iterator v, const symmetry &symm)
 {
-       // Less than two indices? Then do nothing
+       // Less than two elements? Then do nothing
        if (symm.indices.size() < 2)
                return INT_MAX;
 
@@ -321,7 +313,7 @@ int canonicalize(exvector::iterator v, const symmetry &symm)
        int sign = 1;
        exvector::const_iterator first = symm.children.begin(), last = symm.children.end();
        while (first != last) {
-               GINAC_ASSERT(is_ex_exactly_of_type(*first, symmetry));
+               GINAC_ASSERT(is_exactly_a<symmetry>(*first));
                int child_sign = canonicalize(v, ex_to<symmetry>(*first));
                if (child_sign == 0)
                        return 0;
@@ -342,6 +334,8 @@ int canonicalize(exvector::iterator v, const symmetry &symm)
                case symmetry::antisymmetric:
                        // Sort the children in ascending order, keeping track of the signum
                        sign *= permutation_sign(first, last, sy_is_less(v), sy_swap(v, something_changed));
+                       if (sign == 0)
+                               return 0;
                        break;
                case symmetry::cyclic:
                        // Permute the smallest child to the front