X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fconstant.h;h=b30fc26257a24b72e14b4faa0b8b931d3e8dfc2d;hb=b8e4e8958d3884ea3c91ac9a8b99fb912ea44626;hp=e772ada848566a796b9e307f48748a6f2cdd5bb6;hpb=a8507b8af1c08d9b27d98d57f95c7ca1a8671e27;p=ginac.git

diff --git a/ginac/constant.h b/ginac/constant.h
index e772ada8..b30fc262 100644
--- a/ginac/constant.h
+++ b/ginac/constant.h
@@ -1,8 +1,9 @@
 /** @file constant.h
  *
- *  Interface to GiNaC's constant types and some special constants.
- *
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  Interface to GiNaC's constant types and some special constants. */
+
+/*
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -23,67 +24,66 @@
 #define __GINAC_CONSTANT_H__
 
 #include <string>
+#include "basic.h"
+#include "ex.h"
+
+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)
+	
 // member functions
-
-    // default constructor, destructor, copy constructor assignment operator and helpers
+	
+	// other ctors
 public:
-    ~constant();
-    constant(constant const & other);
-    // constant const & operator=(constant const & other); /* it's pervert! */
-protected:
-    void copy(constant const & other);
-    void destroy(bool call_parent);
-
-    // other constructors
-public:
-    constant(string const & initname, ex (*efun)()=0);
-    constant(string const & initname, numeric const & initnumber);
-
-    // functions overriding virtual functions from bases classes
+	constant(const std::string & initname, evalffunctype efun = 0);
+	constant(const std::string & initname, const numeric & initnumber);
+	
+	// functions overriding virtual functions from bases classes
 public:
-    basic * duplicate() const;
-    void printraw(ostream & os) const;
-    void print(ostream & os, unsigned upper_precedence=0) const;
-    void printcsrc(ostream & os, unsigned type, unsigned upper_precedence=0) const;
-    ex evalf(int level=0) const;
-    ex diff(symbol const & s) const;
+	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;
 protected:
-    int compare_same_type(basic const & other) const;
-    bool is_equal_same_type(basic const & 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;
-    ex (*ef)();
-    numeric * number;
-    bool fct_assigned;
-    unsigned serial;  //!< unique serial number for comparision
-    static unsigned next_serial;
+	std::string name;   ///< printname of this constant
+	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 type_info const & typeid_constant;
-
-// extern const numeric I;
 extern const constant Pi;
 extern const constant Catalan;
-extern const constant EulerGamma;
+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__