X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fconstant.h;h=6f3aa0fa1786bc4e924a46f3782d034a9bafa65a;hp=4d456bd3754c596c5b3ed65f96e9fcd2a58d9f8a;hb=2c3ef3ce66bd2223c756d0fa90fc9f2f188c053d;hpb=a43a2fe7d9df31529647c66dcfb9cad544ffd369

diff --git a/ginac/constant.h b/ginac/constant.h
index 4d456bd3..6f3aa0fa 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-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2002 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,79 +25,65 @@
 
 #include <string>
 #include "basic.h"
+#include "ex.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 typedef ex (*evalffunctype)(void);
-    
+	
 /** This class holds constants, symbols with specific numerical value. Each
  *  object of this class must either provide their own function to evaluate it
  *  to class numeric or provide the constant as a numeric (if it's an exact
  *  number). */
 class constant : public basic
 {
-    GINAC_DECLARE_REGISTERED_CLASS(constant, basic)
-
+	GINAC_DECLARE_REGISTERED_CLASS(constant, basic)
+	
 // member functions
-
-    // default constructor, destructor, copy constructor assignment operator and helpers
+	
+	// other ctors
 public:
-    constant();
-    ~constant();
-    constant(const constant & other);
-    // const constant & operator=(const constant & other); /* it's pervert! */
-protected:
-    void copy(const constant & other);
-    void destroy(bool call_parent);
-
-    // other constructors
+	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:
-    constant(const string & initname, evalffunctype efun=0);
-    constant(const string & initname, const numeric & initnumber);
-
-    // functions overriding virtual functions from bases classes
-public:
-    basic * duplicate() const;
-    void print(ostream & os, unsigned upper_precedence=0) const;
-    void printraw(ostream & os) const;
-    void printtree(ostream & os, unsigned indent) const;
-    void printcsrc(ostream & os, unsigned type, unsigned upper_precedence=0) const;
-    ex evalf(int level=0) const;
+	void print(const print_context & c, unsigned level = 0) const;
+	ex evalf(int level = 0) const;
 protected:
-    ex derivative(const symbol & s) const;
-    int compare_same_type(const basic & other) const;
-    bool is_equal_same_type(const basic & other) const;
-    
-    // new virtual functions which can be overridden by derived classes
-    // none
-
-    // non-virtual functions in this class
-    // none
-
+	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
+	
+	// non-virtual functions in this class
+	// none
+	
 // member variables
-
+	
 private:
-    string name;
-    evalffunctype ef;
-    numeric * number;
-    // bool fct_assigned;
-    unsigned serial;  //!< unique serial number for comparision
-    static unsigned next_serial;
+	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
+	static unsigned next_serial;
 };
 
-// global constants
-
-extern const constant some_constant;
-extern const type_info & typeid_constant;
-
 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__