* Added output-support for Python bindings and LaTeX printing for

[ginac.git] / ginac / constant.cpp

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index 7afc35beb749b404a6b078ceb2051cccf0ce836b..beabc9669369794061c8a29816dd4f86d347b057 100644 (file)
--- a/ginac/constant.cpp
+++ b/ginac/constant.cpp
@@ -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), name(""), 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
 
@@ -53,6 +50,7 @@ void constant::copy(const constant & other)
 {
        inherited::copy(other);
        name = other.name;
+       TeX_name = other.TeX_name;
        serial = other.serial;
        ef = other.ef;
        if (other.number != 0)
@@ -74,28 +72,31 @@ void constant::destroy(bool call_parent)
 
 // public
 
-constant::constant(const std::string & initname, evalffunctype efun)
+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);
-       setflag(status_flags::evaluated);
+       if (texname.empty())
+               TeX_name = "\\mbox{" + name + "}";
+       else
+               TeX_name = texname;
+       setflag(status_flags::evaluated | status_flags::expanded);
 }
 
-constant::constant(const std::string & initname, const numeric & initnumber)
+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);
-       setflag(status_flags::evaluated);
+       if (texname.empty())
+               TeX_name = "\\mbox{" + name + "}";
+       else
+               TeX_name = texname;
+       setflag(status_flags::evaluated | status_flags::expanded);
 }
 
 //////////
 // 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)
 {
@@ -122,41 +123,44 @@ void constant::archive(archive_node &n) const
 }
 
 //////////
-// functions overriding virtual functions from bases classes
+// functions overriding virtual functions from base classes
 //////////
 
 // public
 
 void constant::print(const print_context & c, unsigned level) const
 {
-       debugmsg("constant print", LOGLEVEL_PRINT);
-
-       if (is_of_type(c, print_tree)) {
-
+       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)) {
+               c.s << TeX_name;
+       } 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(*s.bp) ? 1 : 0;
+       return is_equal(ex_to<basic>(s)) ? 1 : 0;
 }
 
 int constant::ldegree(const ex & s) const
 {
-       return is_equal(*s.bp) ? 1 : 0;
+       return is_equal(ex_to<basic>(s)) ? 1 : 0;
 }
 
 ex constant::coeff(const ex & s, int n) const
 {
-       if (is_equal(*s.bp))
-               return n==1 ? _ex1() : _ex0();
+       if (is_equal(ex_to<basic>(s)))
+               return n==1 ? _ex1 : _ex0;
        else
-               return n==0 ? *this : _ex0();
+               return n==0 ? *this : _ex0;
 }
 
 ex constant::evalf(int level) const
@@ -171,29 +175,31 @@ ex constant::evalf(int level) const
 
 // protected
 
-/** Implementation of ex::diff() for a constant. It always returns 0.
+/** Implementation of ex::diff() for a constant always returns 0.
  *
  *  @see ex::diff */
 ex constant::derivative(const symbol & s) const
 {
-       return _ex0();
+       return _ex0;
 }
 
 int constant::compare_same_type(const basic & other) const
 {
-       GINAC_ASSERT(is_exactly_of_type(other, constant));
-       // const constant & o=static_cast<constant &>(const_cast<basic &>(other));
-       // return name.compare(o.name);
-       const constant *o = static_cast<const constant *>(&other);
-       if (serial==o->serial) return 0;
-       return serial < o->serial ? -1 : 1;
+       GINAC_ASSERT(is_exactly_a<constant>(other));
+       const constant &o = static_cast<const constant &>(other);
+
+       if (serial == o.serial)
+               return 0;
+       else
+               return serial < o.serial ? -1 : 1;
 }
 
 bool constant::is_equal_same_type(const basic & other) const
 {
-       GINAC_ASSERT(is_exactly_of_type(other, constant));
-       const constant *o = static_cast<const constant *>(&other);
-       return serial==o->serial;
+       GINAC_ASSERT(is_exactly_a<constant>(other));
+       const constant &o = static_cast<const constant &>(other);
+
+       return serial == o.serial;
 }
 
 unsigned constant::calchash(void) const
@@ -230,13 +236,13 @@ unsigned constant::next_serial = 0;
 //////////
 
 /**  Pi. (3.14159...)  Diverts straight into CLN for evalf(). */
-const constant Pi("Pi", PiEvalf);
+const constant Pi("Pi", PiEvalf, "\\pi");
 
 /** Euler's constant. (0.57721...)  Sometimes called Euler-Mascheroni constant.
  *  Diverts straight into CLN for evalf(). */
-const constant Euler("Euler", EulerEvalf);
+const constant Euler("Euler", EulerEvalf, "\\gamma_E");
 
 /** Catalan's constant. (0.91597...)  Diverts straight into CLN for evalf(). */
-const constant Catalan("Catalan", CatalanEvalf);
+const constant Catalan("Catalan", CatalanEvalf, "G");
 
 } // namespace GiNaC