Merge commit 'origin/master'

[ginac.git] / ginac / constant.cpp

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index 8ae372be1965c26a8d8549cad381a74e8f853ae0..13acc363f54db0f0dd3f3908ae6ab5e1d987a86b 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-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 {
 
@@ -141,7 +142,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 +164,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.
@@ -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