* Wrapper template for making GiNaC classes out of C++ structures. */
/*
- * GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2006 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __GINAC_STRUCTURE_H__
#include <functional>
#include "ex.h"
+#include "ncmul.h"
+#include "numeric.h"
#include "operators.h"
#include "print.h"
namespace GiNaC {
-extern unsigned next_structure_tinfo_key;
-
/** Comparison policy: all structures of one type are equal */
template <class T>
GINAC_DECLARE_REGISTERED_CLASS(structure, basic)
// helpers
- static unsigned get_tinfo() { return reg_info.options.get_id(); }
+ static tinfo_t get_tinfo() { return reg_info.options.get_id(); }
static const char *get_class_name() { return "structure"; }
+ static tinfo_t next_structure_tinfo_key() { return new tinfo_static_t; }
// constructors
public:
ex evalf(int level = 0) const { return inherited::evalf(level); }
ex evalm() const { return inherited::evalm(); }
protected:
- ex eval_ncmul(const exvector & v) const { return this->hold_ncmul(v); }
+ ex eval_ncmul(const exvector & v) const { return hold_ncmul(v); }
public:
ex eval_indexed(const basic & i) const { return i.hold(); }
ex & operator[](size_t i) { return inherited::operator[](i); }
// pattern matching
- bool has(const ex & other) const { return inherited::has(other); }
+ bool has(const ex & other, unsigned options = 0) const { return inherited::has(other, options); }
bool match(const ex & pattern, lst & repl_lst) const { return inherited::match(pattern, repl_lst); }
protected:
bool match_same_type(const basic & other) const { return true; }
// indexed objects
exvector get_free_indices() const { return exvector(); }
ex add_indexed(const ex & self, const ex & other) const { return self + other; }
- ex scalar_mul_indexed(const ex & self, const numeric & other) const { return self * other; }
+ ex scalar_mul_indexed(const ex & self, const numeric & other) const { return self * ex(other); }
bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const { return false; }
// noncommutativity
unsigned return_type() const { return return_types::commutative; }
- unsigned return_type_tinfo() const { return tinfo(); }
+ const basic* return_type_tinfo() const { return this; }
protected:
bool is_equal_same_type(const basic & other) const
const T *operator->() const { return &obj; }
T &get_struct() { return obj; }
const T &get_struct() const { return obj; }
-
private:
T obj;
};
}
template <class T, template <class> class CP>
-registered_class_info structure<T, CP>::reg_info = registered_class_info(registered_class_options(structure::get_class_name(), "basic", next_structure_tinfo_key++, &structure::unarchive));
+registered_class_info structure<T, CP>::reg_info = registered_class_info(registered_class_options(structure::get_class_name(), "basic", structure::next_structure_tinfo_key(), &structure::unarchive));
} // namespace GiNaC