collect_common_factors now works with powers [A.Sheplyakov]

[ginac.git] / ginac / structure.h

diff --git a/ginac/structure.h b/ginac/structure.h
index dbe97d4226740060ef3a329a5b8913534ef2a117..23ae9c29bc43c911d09070f9712ad631b7d0c1a3 100644 (file)
--- a/ginac/structure.h
+++ b/ginac/structure.h
@@ -3,7 +3,7 @@
  *  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
@@ -17,7 +17,7 @@
  *
  *  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__
@@ -26,6 +26,8 @@
 #include <functional>
 
 #include "ex.h"
+#include "ncmul.h"
+#include "numeric.h"
 #include "operators.h"
 #include "print.h"
 
@@ -133,7 +135,7 @@ 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(); }
 
@@ -194,7 +196,7 @@ public:
        // 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