* Wrapper template for making GiNaC classes out of C++ structures. */
/*
- * GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2005 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 {
// rational functions
ex normal(exmap & repl, exmap & rev_lookup, int level = 0) const { return inherited::normal(repl, rev_lookup, level); }
- ex to_rational(lst & repl_lst) const { return inherited::to_rational(repl_lst); }
- ex to_polynomial(lst & repl_lst) const { return inherited::to_polynomial(repl_lst); }
+ ex to_rational(exmap & repl) const { return inherited::to_rational(repl); }
+ ex to_polynomial(exmap & repl) const { return inherited::to_polynomial(repl); }
// polynomial algorithms
numeric integer_content() const { return 1; }
// 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