- symbols can have a LaTeX name, e.g. symbol s("s", "\\sigma");

[ginac.git] / ginac / constant.h

diff --git a/ginac/constant.h b/ginac/constant.h
index 70b2816e35a2885f58c3c639577af9b94ae60a5b..bf85b382d6c5b38dc2e4ddc5ab89544c2209420d 100644 (file)
--- 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,51 +38,40 @@ 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);
-
+       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 bases 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;
 };
 
@@ -91,8 +79,12 @@ extern const constant Pi;
 extern const constant Catalan;
 extern const constant Euler;
 
-#ifndef NO_NAMESPACE_GINAC
+// utility functions
+inline const constant &ex_to_constant(const ex &e)
+{
+       return static_cast<const constant &>(*e.bp);
+}
+
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_CONSTANT_H__