X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fnormal.h;h=60859b6fa8fde29f0a77df5384f289156c297ece;hp=9196f965cf428ec5478f9223c174cc5be4d44169;hb=b60ef16e9be16480499da701216b4a5081ee9a97;hpb=3dfe5d31528291d1be6b1fe1180622efdabfebde

diff --git a/ginac/normal.h b/ginac/normal.h
index 9196f965..60859b6f 100644
--- a/ginac/normal.h
+++ b/ginac/normal.h
@@ -6,7 +6,7 @@
  *  computation, square-free factorization and rational function normalization. */
 
 /*
- *  GiNaC Copyright (C) 1999-2002 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2007 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
@@ -20,7 +20,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_NORMAL_H__
@@ -34,19 +34,19 @@ class ex;
 class symbol;
 
 // Quotient q(x) of polynomials a(x) and b(x) in Q[x], so that a(x)=b(x)*q(x)+r(x)
-extern ex quo(const ex &a, const ex &b, const symbol &x, bool check_args = true);
+extern ex quo(const ex &a, const ex &b, const ex &x, bool check_args = true);
 
 // Remainder r(x) of polynomials a(x) and b(x) in Q[x], so that a(x)=b(x)*q(x)+r(x)
-extern ex rem(const ex &a, const ex &b, const symbol &x, bool check_args = true);
+extern ex rem(const ex &a, const ex &b, const ex &x, bool check_args = true);
 
 // Decompose rational function a(x)=N(x)/D(x) into Q(x)+R(x)/D(x) with degree(R, x) < degree(D, x)
-extern ex decomp_rational(const ex &a, const symbol &x);
+extern ex decomp_rational(const ex &a, const ex &x);
 
 // Pseudo-remainder of polynomials a(x) and b(x) in Q[x]
-extern ex prem(const ex &a, const ex &b, const symbol &x, bool check_args = true);
+extern ex prem(const ex &a, const ex &b, const ex &x, bool check_args = true);
 
 // Pseudo-remainder of polynomials a(x) and b(x) in Q[x]
-extern ex sprem(const ex &a, const ex &b, const symbol &x, bool check_args = true);
+extern ex sprem(const ex &a, const ex &b, const ex &x, bool check_args = true);
 
 // Exact polynomial division of a(X) by b(X) in Q[X] (quotient returned in q), returns false when exact division fails
 extern bool divide(const ex &a, const ex &b, ex &q, bool check_args = true);
@@ -66,6 +66,9 @@ extern ex sqrfree_parfrac(const ex & a, const symbol & x);
 // Collect common factors in sums.
 extern ex collect_common_factors(const ex & e);
 
+// Resultant of two polynomials e1,e2 with respect to symbol s.
+extern ex resultant(const ex & e1, const ex & e2, const ex & s);
+
 } // namespace GiNaC
 
 #endif // ndef __GINAC_NORMAL_H__