X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fconstant.cpp;h=636eeae4104eb7ad3b82377ac0de0d5729d038f4;hp=60c3be247dea1e47c2123d37921026e5fca523de;hb=dbd9c306a74f1cb258c0d15a346b973b39deaad2;hpb=aa6281216091efd92dc5fcc3f96c7189114e80f1

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index 60c3be24..636eeae4 100644
--- 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(*s.bp) ? 1 : 0;
-}
-
-int constant::ldegree(const ex & s) const
-{
-	return is_equal(*s.bp) ? 1 : 0;
-}
-
-ex constant::coeff(const ex & s, int n) const
-{
-	if (is_equal(*s.bp))
-		return n==1 ? _ex1() : _ex0();
-	else
-		return n==0 ? *this : _ex0();
-}
-
 ex constant::evalf(int level) const
 {
 	if (ef!=0) {
@@ -185,12 +162,12 @@ ex constant::evalf(int level) const
  *  @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));
+	GINAC_ASSERT(is_exactly_a<constant>(other));
 	const constant &o = static_cast<const constant &>(other);
 
 	if (serial == o.serial)
@@ -201,7 +178,7 @@ int constant::compare_same_type(const basic & other) const
 
 bool constant::is_equal_same_type(const basic & other) const
 {
-	GINAC_ASSERT(is_exactly_of_type(other, constant));
+	GINAC_ASSERT(is_exactly_a<constant>(other));
 	const constant &o = static_cast<const constant &>(other);
 
 	return serial == o.serial;