series expansion behaviour fixed.

[ginac.git] / ginac / constant.cpp

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index 371902bdebdbe1cd5a3badb8310ab59ffea1a62c..0b6eec27d8cefd1c3c60f2f4a26f59115a8671c7 100644 (file)
--- a/ginac/constant.cpp
+++ b/ginac/constant.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's constant types and some special constants. */
 
 /*
- *  GiNaC Copyright (C) 1999-2002 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2003 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
@@ -41,7 +41,10 @@ GINAC_IMPLEMENT_REGISTERED_CLASS(constant, basic)
 
 // public
 
-constant::constant() : basic(TINFO_constant), ef(0), number(0), serial(next_serial++) {}
+constant::constant() : basic(TINFO_constant), ef(0), number(0), serial(next_serial++)
+{
+       setflag(status_flags::evaluated | status_flags::expanded);
+}
 
 // protected
 
@@ -96,9 +99,9 @@ constant::constant(const std::string & initname, const numeric & initnumber, con
 // archiving
 //////////
 
-constant::constant(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) {}
+constant::constant(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) {}
 
-ex constant::unarchive(const archive_node &n, const lst &sym_lst)
+ex constant::unarchive(const archive_node &n, lst &sym_lst)
 {
        // Find constant by name (!! this is bad: 'twould be better if there
        // was a list of all global constants that we could search)
@@ -145,24 +148,6 @@ void constant::print(const print_context & c, unsigned level) const
                c.s << name;
 }
 
-int constant::degree(const ex & s) const
-{
-       return is_equal(ex_to<basic>(s)) ? 1 : 0;
-}
-
-int constant::ldegree(const ex & s) const
-{
-       return is_equal(ex_to<basic>(s)) ? 1 : 0;
-}
-
-ex constant::coeff(const ex & s, int n) const
-{
-       if (is_equal(ex_to<basic>(s)))
-               return n==1 ? _ex1 : _ex0;
-       else
-               return n==0 ? *this : _ex0;
-}
-
 ex constant::evalf(int level) const
 {
        if (ef!=0) {
@@ -205,11 +190,9 @@ bool constant::is_equal_same_type(const basic & other) const
 unsigned constant::calchash(void) const
 {
        hashvalue = golden_ratio_hash(tinfo() ^ serial);
-       // mask out numeric hashes:
-       hashvalue &= 0x7FFFFFFFU;
-       
+
        setflag(status_flags::hash_calculated);
-       
+
        return hashvalue;
 }