X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fconstant.h;h=c43465ae6f732485d0fcf12b82f62e371bf494df;hp=fa67f70e50260b0eebce0bec871fe17bcdd818c5;hb=45355e89c34795306f493fe46613ac66d55ab89a;hpb=383d5eb3b0f0506810d9105a268f939125bfc347

diff --git a/ginac/constant.h b/ginac/constant.h
index fa67f70e..c43465ae 100644
--- a/ginac/constant.h
+++ b/ginac/constant.h
@@ -25,10 +25,9 @@
 
 #include <string>
 #include "basic.h"
+#include "ex.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 typedef ex (*evalffunctype)(void);
 	
@@ -39,65 +38,55 @@ typedef ex (*evalffunctype)(void);
 class constant : public basic
 {
 	GINAC_DECLARE_REGISTERED_CLASS(constant, basic)
-
+	
 // member functions
-
-	// default constructor, destructor, copy constructor assignment operator and helpers
-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
+	
+	// other ctors
 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:
-	basic * duplicate() 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;
+	void print(const print_context & c, unsigned level = 0) const;
+	int degree(const ex & s) const;
+	int ldegree(const ex & s) const;
+	ex coeff(const ex & s, int n = 1) 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;
+	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:
-	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
+	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 std::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__