X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fconstant.h;h=cff0e42f028d069d0df886660fe4613ce1bbef02;hp=cf31814f510939ac94e952ac602056bdff7ed417;hb=30b6666cc3c35756cd952dbb52314e0e2f93f7c0;hpb=1bd972bf8e4eeeb8aec6081100876e81a7f18450

diff --git a/ginac/constant.h b/ginac/constant.h
index cf31814f..cff0e42f 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-2004 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
@@ -25,12 +25,11 @@
 
 #include <string>
 #include "basic.h"
+#include "ex.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_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
@@ -39,39 +38,36 @@ typedef ex (*evalffunctype)(void);
 class constant : public basic
 {
 	GINAC_DECLARE_REGISTERED_CLASS(constant, basic)
-
+	
 // member functions
-
+	
 	// other constructors
 public:
-	constant(const std::string & initname, evalffunctype efun=0);
-	constant(const std::string & initname, const numeric & initnumber);
-
-	// functions overriding virtual functions from bases classes
+	constant(const std::string & initname, evalffunctype efun = 0, const std::string & texname = std::string());
+	constant(const std::string & initname, const numeric & initnumber, const std::string & texname = std::string());
+	
+	// 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;
-	ex evalf(int level=0) const;
+	ex evalf(int level = 0) const;
 protected:
 	ex derivative(const symbol & s) const;
 	bool is_equal_same_type(const basic & other) const;
+	unsigned calchash() const;
 	
-	// new virtual functions which can be overridden by derived classes
-	// none
-
 	// 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;
+	std::string name;     ///< printname of this constant
+	std::string TeX_name; ///< LaTeX name
 	evalffunctype ef;
-	numeric * number;
-	// bool fct_assigned;
-	unsigned serial;  //!< unique serial number for comparision
+	ex number;            ///< numerical value this constant evalf()s to
+	unsigned serial;      ///< unique serial number for comparison
 	static unsigned next_serial;
 };
 
@@ -79,8 +75,14 @@ extern const constant Pi;
 extern const constant Catalan;
 extern const constant Euler;
 
-#ifndef NO_NAMESPACE_GINAC
+// utility functions
+
+/** Specialization of is_exactly_a<constant>(obj) for constant objects. */
+template<> inline bool is_exactly_a<constant>(const basic & obj)
+{
+	return obj.tinfo()==TINFO_constant;
+}
+
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_CONSTANT_H__