X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fex.h;h=498dbd664f7ae80d78aa3a1107aa5e3174891c82;hb=5c4b3dd47c0af4702db2fcf35065a79258df6744;hp=ef121bc5d2402a1878f5f0a2d2869898f50a63bf;hpb=ae3d9413d9279344f8cfae4ffb8a0cca1f558557;p=ginac.git

diff --git a/ginac/ex.h b/ginac/ex.h
index ef121bc5..498dbd66 100644
--- a/ginac/ex.h
+++ b/ginac/ex.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's light-weight expression handles. */
 
 /*
- *  GiNaC Copyright (C) 1999-2004 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_EX_H__
@@ -117,6 +117,7 @@ public:
 	ex evalf(int level = 0) const { return bp->evalf(level); }
 	ex evalm() const { return bp->evalm(); }
 	ex eval_ncmul(const exvector & v) const { return bp->eval_ncmul(v); }
+	ex eval_integ() const { return bp->eval_integ(); }
 
 	// printing
 	void print(const print_context & c, unsigned level = 0) const;
@@ -192,6 +193,7 @@ public:
 	numeric integer_content() const;
 	ex primpart(const ex &x) const;
 	ex primpart(const ex &x, const ex &cont) const;
+	void unitcontprim(const ex &x, ex &u, ex &c, ex &p) const;
 	ex smod(const numeric &xi) const { return bp->smod(xi); }
 	numeric max_coefficient() const;
 
@@ -752,6 +754,9 @@ inline size_t nops(const ex & thisex)
 inline ex expand(const ex & thisex, unsigned options = 0)
 { return thisex.expand(options); }
 
+inline ex conjugate(const ex & thisex)
+{ return thisex.conjugate(); }
+
 inline bool has(const ex & thisex, const ex & pattern)
 { return thisex.has(pattern); }
 
@@ -803,6 +808,9 @@ inline ex evalf(const ex & thisex, int level = 0)
 inline ex evalm(const ex & thisex)
 { return thisex.evalm(); }
 
+inline ex eval_integ(const ex & thisex)
+{ return thisex.eval_integ(); }
+
 inline ex diff(const ex & thisex, const symbol & s, unsigned nth = 1)
 { return thisex.diff(s, nth); }