X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fconstant.cpp;h=10972b076a82d69c1b58824b88a681ed24f9f818;hp=8ae372be1965c26a8d8549cad381a74e8f853ae0;hb=9d92d4b442fc4c1a95685884be4ba0494cd02bbe;hpb=9f72781762c9ec7fe10a1f73207d734d79b71917

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index 8ae372be..10972b07 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-2006 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2008 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
@@ -29,6 +29,7 @@
 #include "ex.h"
 #include "archive.h"
 #include "utils.h"
+#include "inifcns.h"
 
 namespace GiNaC {
 
@@ -44,7 +45,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(constant, basic,
 
 // public
 
-constant::constant() : basic(&constant::tinfo_static), ef(0), serial(next_serial++), domain(domain::complex)
+constant::constant() : ef(0), serial(next_serial++), domain(domain::complex)
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
@@ -56,7 +57,7 @@ constant::constant() : basic(&constant::tinfo_static), ef(0), serial(next_serial
 // public
 
 constant::constant(const std::string & initname, evalffunctype efun, const std::string & texname, unsigned dm)
-  : basic(&constant::tinfo_static), name(initname), ef(efun), serial(next_serial++), domain(dm)
+  : name(initname), ef(efun), serial(next_serial++), domain(dm)
 {
 	if (texname.empty())
 		TeX_name = "\\mbox{" + name + "}";
@@ -66,7 +67,7 @@ constant::constant(const std::string & initname, evalffunctype efun, const std::
 }
 
 constant::constant(const std::string & initname, const numeric & initnumber, const std::string & texname, unsigned dm)
-  : basic(&constant::tinfo_static), name(initname), ef(0), number(initnumber), serial(next_serial++), domain(dm)
+  : name(initname), ef(0), number(initnumber), serial(next_serial++), domain(dm)
 {
 	if (texname.empty())
 		TeX_name = "\\mbox{" + name + "}";
@@ -79,25 +80,24 @@ constant::constant(const std::string & initname, const numeric & initnumber, con
 // archiving
 //////////
 
-constant::constant(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) {}
-
-ex constant::unarchive(const archive_node &n, lst &sym_lst)
+void constant::read_archive(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)
 	std::string s;
 	if (n.find_string("name", s)) {
 		if (s == Pi.name)
-			return Pi;
+			*this = Pi;
 		else if (s == Catalan.name)
-			return Catalan;
+			*this = Catalan;
 		else if (s == Euler.name)
-			return Euler;
+			*this = Euler;
 		else
 			throw (std::runtime_error("unknown constant '" + s + "' in archive"));
 	} else
 		throw (std::runtime_error("unnamed constant in archive"));
 }
+GINAC_BIND_UNARCHIVER(constant);
 
 void constant::archive(archive_node &n) const
 {
@@ -141,7 +141,9 @@ bool constant::info(unsigned inf) const
 	if (inf == info_flags::polynomial)
 		return true;
 	if (inf == info_flags::real)
-		return domain == domain::real;
+		return domain==domain::real || domain==domain::positive ;
+	if (inf==info_flags::positive || inf==info_flags::nonnegative)
+		return domain == domain::positive;
 	else
 		return inherited::info(inf);
 }
@@ -161,6 +163,27 @@ bool constant::is_polynomial(const ex & var) const
 	return true;
 }
 
+ex constant::conjugate() const
+{
+	if ( domain==domain::real || domain==domain::positive )
+		return *this;
+	return conjugate_function(*this).hold();
+}
+
+ex constant::real_part() const
+{
+	if ( domain==domain::real || domain==domain::positive )
+		return *this;
+	return real_part_function(*this).hold();
+}
+
+ex constant::imag_part() const
+{
+	if ( domain==domain::real || domain==domain::positive )
+		return 0;
+	return imag_part_function(*this).hold();
+}
+
 // protected
 
 /** Implementation of ex::diff() for a constant always returns 0.
@@ -192,7 +215,8 @@ bool constant::is_equal_same_type(const basic & other) const
 
 unsigned constant::calchash() const
 {
-	hashvalue = golden_ratio_hash((p_int)tinfo() ^ serial);
+	const void* typeid_this = (const void*)typeid(*this).name();
+	hashvalue = golden_ratio_hash((p_int)typeid_this ^ serial);
 
 	setflag(status_flags::hash_calculated);
 
@@ -222,13 +246,13 @@ unsigned constant::next_serial = 0;
 //////////
 
 /**  Pi. (3.14159...)  Diverts straight into CLN for evalf(). */
-const constant Pi("Pi", PiEvalf, "\\pi", domain::real);
+const constant Pi("Pi", PiEvalf, "\\pi", domain::positive);
 
 /** Euler's constant. (0.57721...)  Sometimes called Euler-Mascheroni constant.
  *  Diverts straight into CLN for evalf(). */
-const constant Euler("Euler", EulerEvalf, "\\gamma_E", domain::real);
+const constant Euler("Euler", EulerEvalf, "\\gamma_E", domain::positive);
 
 /** Catalan's constant. (0.91597...)  Diverts straight into CLN for evalf(). */
-const constant Catalan("Catalan", CatalanEvalf, "G", domain::real);
+const constant Catalan("Catalan", CatalanEvalf, "G", domain::positive);
 
 } // namespace GiNaC