X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fconstant.h;h=2353b32fa2d6aba9c18094d23346aa4c45363d7e;hp=d56f2bc861389e3e29ae236bd24f209350b29d6a;hb=ab8da4fe0687969d124c2c3b3e6ce62a63376a0a;hpb=a40b470aeccc76b9a6055dc5191805e0bb6f7df2

diff --git a/ginac/constant.h b/ginac/constant.h
index d56f2bc8..2353b32f 100644
--- a/ginac/constant.h
+++ b/ginac/constant.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's constant types and some special constants. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2009 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
@@ -17,19 +17,21 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_CONSTANT_H__
-#define __GINAC_CONSTANT_H__
+#ifndef GINAC_CONSTANT_H
+#define GINAC_CONSTANT_H
 
-#include <string>
 #include "basic.h"
 #include "ex.h"
+#include "archive.h"
+
+#include <string>
 
 namespace GiNaC {
 
-typedef ex (*evalffunctype)(void);
+typedef ex (*evalffunctype)();
 	
 /** This class holds constants, symbols with specific numerical value. Each
  *  object of this class must either provide their own function to evaluate it
@@ -38,55 +40,49 @@ typedef ex (*evalffunctype)(void);
 class constant : public basic
 {
 	GINAC_DECLARE_REGISTERED_CLASS(constant, basic)
-	
-// member functions
-	
-	// other ctors
+	// other constructors
 public:
-	constant(const std::string & initname, evalffunctype efun = 0);
-	constant(const std::string & initname, const numeric & initnumber);
+	constant(const std::string & initname, evalffunctype efun = 0, const std::string & texname = std::string(), unsigned domain = domain::complex);
+	constant(const std::string & initname, const numeric & initnumber, const std::string & texname = std::string(), unsigned domain = domain::complex);
 	
-	// functions overriding virtual functions from bases classes
+	// functions overriding virtual functions from base classes
 public:
-	void print(std::ostream & os, unsigned upper_precedence = 0) const;
-	void printraw(std::ostream & os) const;
-	void printtree(std::ostream & os, unsigned indent) const;
-	void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence = 0) const;
-	int degree(const ex & s) const;
-	int ldegree(const ex & s) const;
-	ex coeff(const ex & s, int n = 1) const;
+	bool info(unsigned inf) const;
 	ex evalf(int level = 0) const;
+	bool is_polynomial(const ex & var) const;
+	ex conjugate() const;
+	ex real_part() const;
+	ex imag_part() const;
+	void archive(archive_node& n) const;
+	void read_archive(const archive_node& n, lst& syms);
 protected:
 	ex derivative(const symbol & s) const;
 	bool is_equal_same_type(const basic & other) const;
-	unsigned calchash(void) const;
-	
-	// new virtual functions which can be overridden by derived classes
-	// none
+	unsigned calchash() const;
 	
 	// non-virtual functions in this class
-	// none
-	
+protected:
+	void do_print(const print_context & c, unsigned level) const;
+	void do_print_tree(const print_tree & c, unsigned level) const;
+	void do_print_latex(const print_latex & c, unsigned level) const;
+	void do_print_python_repr(const print_python_repr & c, unsigned level) const;
+
 // member variables
-	
 private:
-	std::string name;   ///< printname of this constant
+	std::string name;     ///< printname of this constant
+	std::string TeX_name; ///< LaTeX name
 	evalffunctype ef;
-	numeric *number;    ///< numerical value this constant evalf()s to
-	unsigned serial;    ///< unique serial number for comparison
+	ex number;            ///< numerical value this constant evalf()s to
+	unsigned serial;      ///< unique serial number for comparison
 	static unsigned next_serial;
+	unsigned domain;      ///< numerical value this constant evalf()s to
 };
+GINAC_DECLARE_UNARCHIVER(constant); 
 
 extern const constant Pi;
 extern const constant Catalan;
 extern const constant Euler;
 
-// utility functions
-inline const constant &ex_to_constant(const ex &e)
-{
-	return static_cast<const constant &>(*e.bp);
-}
-
 } // namespace GiNaC
 
-#endif // ndef __GINAC_CONSTANT_H__
+#endif // ndef GINAC_CONSTANT_H