- (l)degree(s), coeff(s, n) and collect(s) were extended to accept expressions

[ginac.git] / ginac / basic.cpp

diff --git a/ginac/basic.cpp b/ginac/basic.cpp
index d77e7dc44fe3838f6e8c65765faa19fd583b8dd4..fb73096fa70a4796e301ade46306d53849d25068 100644 (file)
--- a/ginac/basic.cpp
+++ b/ginac/basic.cpp
@@ -236,19 +236,22 @@ ex basic::map(map_function & f) const
 /** Return degree of highest power in object s. */
 int basic::degree(const ex & s) const
 {
 /** Return degree of highest power in object s. */
 int basic::degree(const ex & s) const
 {

-       return 0;
+       return is_equal(ex_to<basic>(s)) ? 1 : 0;

 }
 
 /** Return degree of lowest power in object s. */
 int basic::ldegree(const ex & s) const
 {
 }
 
 /** Return degree of lowest power in object s. */
 int basic::ldegree(const ex & s) const
 {

-       return 0;
+       return is_equal(ex_to<basic>(s)) ? 1 : 0;

 }
 
 /** Return coefficient of degree n in object s. */
 ex basic::coeff(const ex & s, int n) const
 {
 }
 
 /** Return coefficient of degree n in object s. */
 ex basic::coeff(const ex & s, int n) const
 {

-       return n==0 ? *this : _ex0;
+       if (is_equal(ex_to<basic>(s)))
+               return n==1 ? _ex1 : _ex0;
+       else
+               return n==0 ? *this : _ex0;

 }
 
 /** Sort expanded expression in terms of powers of some object(s).
 }
 
 /** Sort expanded expression in terms of powers of some object(s).