* Implementation of GiNaC's symmetry definitions. */
/*
- * GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2010 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
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <iostream>
-#include <stdexcept>
-#include <functional>
-#include <limits>
-
#include "symmetry.h"
#include "lst.h"
#include "numeric.h" // for factorial()
#include "operators.h"
#include "archive.h"
#include "utils.h"
+#include "hash_seed.h"
+
+#include <functional>
+#include <iostream>
+#include <limits>
+#include <stdexcept>
namespace GiNaC {
// default constructor
//////////
-symmetry::symmetry() : inherited(&symmetry::tinfo_static), type(none)
+symmetry::symmetry() : type(none)
{
setflag(status_flags::evaluated | status_flags::expanded);
}
// other constructors
//////////
-symmetry::symmetry(unsigned i) : inherited(&symmetry::tinfo_static), type(none)
+symmetry::symmetry(unsigned i) : type(none)
{
indices.insert(i);
setflag(status_flags::evaluated | status_flags::expanded);
}
-symmetry::symmetry(symmetry_type t, const symmetry &c1, const symmetry &c2) : inherited(&symmetry::tinfo_static), type(t)
+symmetry::symmetry(symmetry_type t, const symmetry &c1, const symmetry &c2) : type(t)
{
add(c1); add(c2);
setflag(status_flags::evaluated | status_flags::expanded);
//////////
/** Construct object from archive_node. */
-symmetry::symmetry(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
+void symmetry::read_archive(const archive_node &n, lst &sym_lst)
{
+ inherited::read_archive(n, sym_lst);
unsigned t;
if (!(n.find_unsigned("type", t)))
throw (std::runtime_error("unknown symmetry type in archive"));
}
}
}
+GINAC_BIND_UNARCHIVER(symmetry);
/** Archive the object. */
void symmetry::archive(archive_node &n) const
}
}
-DEFAULT_UNARCHIVE(symmetry)
-
//////////
// functions overriding virtual functions from base classes
//////////
unsigned symmetry::calchash() const
{
- unsigned v = golden_ratio_hash((p_int)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)
{