X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fconstant.h;h=86f945cdfacc89e0b7c113b2312e084130a29a8c;hp=cff0e42f028d069d0df886660fe4613ce1bbef02;hb=8305ec388e5c205b7392566d32582f9d08adb88d;hpb=6d225ee55693c0617d254e6fa283c00c71bd2919

diff --git a/ginac/constant.h b/ginac/constant.h
index cff0e42f..86f945cd 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-2004 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2016 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,15 +17,17 @@
  *
  *  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 <string>
 #include "basic.h"
 #include "ex.h"
+#include "archive.h"
+
+#include <string>
 
 namespace GiNaC {
 
@@ -38,21 +40,25 @@ typedef ex (*evalffunctype)();
 class constant : public basic
 {
 	GINAC_DECLARE_REGISTERED_CLASS(constant, basic)
-	
-// member functions
-	
 	// other constructors
 public:
-	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());
+	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:
-	ex evalf(int level = 0) const;
+	bool info(unsigned inf) const override;
+	ex evalf() const override;
+	bool is_polynomial(const ex & var) const override;
+	ex conjugate() const override;
+	ex real_part() const override;
+	ex imag_part() const override;
+	void archive(archive_node& n) const override;
+	void read_archive(const archive_node& n, lst& syms) override;
 protected:
-	ex derivative(const symbol & s) const;
-	bool is_equal_same_type(const basic & other) const;
-	unsigned calchash() const;
+	ex derivative(const symbol & s) const override;
+	bool is_equal_same_type(const basic & other) const override;
+	unsigned calchash() const override;
 	
 	// non-virtual functions in this class
 protected:
@@ -69,20 +75,14 @@ private:
 	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); 
 
 extern const constant Pi;
 extern const constant Catalan;
 extern const constant Euler;
 
-// 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 __GINAC_CONSTANT_H__
+#endif // ndef GINAC_CONSTANT_H