- prepared for 1.0.13 release

[ginac.git] / ginac / constant.cpp

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index ce4c80d9cbc1136aef3214b08e469ae00a8da279..636eeae4104eb7ad3b82377ac0de0d5729d038f4 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-2001 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
@@ -22,13 +22,13 @@
 
 #include <string>
 #include <stdexcept>
+#include <iostream>
 
 #include "constant.h"
 #include "numeric.h"
 #include "ex.h"
 #include "print.h"
 #include "archive.h"
-#include "debugmsg.h"
 #include "utils.h"
 
 namespace GiNaC {
@@ -36,15 +36,12 @@ namespace GiNaC {
 GINAC_IMPLEMENT_REGISTERED_CLASS(constant, basic)
 
 //////////
-// default ctor, dtor, copy ctor assignment operator and helpers
+// default ctor, dtor, copy ctor, assignment operator and helpers
 //////////
 
 // public
 
-constant::constant() : basic(TINFO_constant), ef(0), number(0), serial(next_serial++)
-{
-       debugmsg("constant default ctor",LOGLEVEL_CONSTRUCT);
-}
+constant::constant() : basic(TINFO_constant), ef(0), number(0), serial(next_serial++) {}
 
 // protected
 
@@ -78,7 +75,6 @@ void constant::destroy(bool call_parent)
 constant::constant(const std::string & initname, evalffunctype efun, const std::string & texname)
   : basic(TINFO_constant), name(initname), ef(efun), number(0), serial(next_serial++)
 {
-       debugmsg("constant ctor from string, function",LOGLEVEL_CONSTRUCT);
        if (texname.empty())
                TeX_name = "\\mbox{" + name + "}";
        else
@@ -89,7 +85,6 @@ constant::constant(const std::string & initname, evalffunctype efun, const std::
 constant::constant(const std::string & initname, const numeric & initnumber, const std::string & texname)
   : basic(TINFO_constant), name(initname), ef(0), number(new numeric(initnumber)), serial(next_serial++)
 {
-       debugmsg("constant ctor from string, numeric",LOGLEVEL_CONSTRUCT);
        if (texname.empty())
                TeX_name = "\\mbox{" + name + "}";
        else
@@ -101,10 +96,7 @@ 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)
-{
-       debugmsg("constant ctor from archive_node", LOGLEVEL_CONSTRUCT);
-}
+constant::constant(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) {}
 
 ex constant::unarchive(const archive_node &n, const lst &sym_lst)
 {
@@ -138,36 +130,21 @@ void constant::archive(archive_node &n) const
 
 void constant::print(const print_context & c, unsigned level) const
 {
-       debugmsg("constant print", LOGLEVEL_PRINT);
-
        if (is_a<print_tree>(c)) {
                c.s << std::string(level, ' ') << name << " (" << class_name() << ")"
                    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
                    << std::endl;
-       } else if (is_a<print_latex>(c))
+       } else if (is_a<print_latex>(c)) {
                c.s << TeX_name;
-       else
+       } else if (is_a<print_python_repr>(c)) {
+               c.s << class_name() << "('" << name << "'";
+               if (TeX_name != "\\mbox{" + name + "}")
+                       c.s << ",TeX_name='" << TeX_name << "'";
+               c.s << ')';
+       } else
                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) {