X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fconstant.h;h=f75a629f27d27ee3ce3c6e36418caf308f424e75;hp=89cb7ebae83576c0d1e02cf0c33666e9ddbf30ab;hb=dfaba64cff32f7dfdd96c1a96d1744ce6c1d80ad;hpb=9eab44408b9213d8909b7a9e525f404ad06064dd

diff --git a/ginac/constant.h b/ginac/constant.h
index 89cb7eba..f75a629f 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 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2015 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
@@ -17,79 +17,72 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_CONSTANT_H__
-#define __GINAC_CONSTANT_H__
+#ifndef GINAC_CONSTANT_H
+#define GINAC_CONSTANT_H
+
+#include "basic.h"
+#include "ex.h"
+#include "archive.h"
 
 #include <string>
-#include <ginac/basic.h>
 
 namespace GiNaC {
 
+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
  *  to class numeric or provide the constant as a numeric (if it's an exact
  *  number). */
 class constant : public basic
 {
-
-// member functions
-
-    // default constructor, destructor, copy constructor assignment operator and helpers
-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
+	GINAC_DECLARE_REGISTERED_CLASS(constant, basic)
+	// 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 = nullptr, const std::string & texname = std::string(), unsigned domain = domain::complex);
+	constant(const std::string & initname, const numeric & initnumber, const std::string & texname = std::string(), unsigned domain = domain::complex);
+	
+	// functions overriding virtual functions from base 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;
+	bool info(unsigned inf) const;
+	ex evalf(int level = 0) const;
+	bool is_polynomial(const ex & var) const;
+	ex conjugate() const;
+	ex real_part() const;
+	ex imag_part() const;
+	void archive(archive_node& n) const;
+	void read_archive(const archive_node& n, lst& syms);
 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() const;
+	
+	// non-virtual functions in this class
+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:
-    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
+	std::string TeX_name; ///< LaTeX name
+	evalffunctype ef;
+	ex number;            ///< numerical value this constant evalf()s to
+	unsigned serial;      ///< unique serial number for comparison
+	static unsigned next_serial;
+	unsigned domain;      ///< numerical value this constant evalf()s to
 };
+GINAC_DECLARE_UNARCHIVER(constant); 
 
-// 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;
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_CONSTANT_H__
+#endif // ndef GINAC_CONSTANT_H