X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fnumeric.h;h=faac15e214ebf8a63f869a817e1dcae1352e06b0;hp=f2a1adbdc52d8cc070a15c8ad4460fa151d6db3e;hb=55a08d9cb9005bb10def92d5e8f5a816003da16b;hpb=6715b097ae926fecfc62e53d4af38b7217634908

diff --git a/ginac/numeric.h b/ginac/numeric.h
index f2a1adbd..faac15e2 100644
--- a/ginac/numeric.h
+++ b/ginac/numeric.h
@@ -3,7 +3,7 @@
  *  Makes the interface to the underlying bignum package available. */
 
 /*
- *  GiNaC Copyright (C) 1999-2005 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2014 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
@@ -20,23 +20,22 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_NUMERIC_H__
-#define __GINAC_NUMERIC_H__
+#ifndef GINAC_NUMERIC_H
+#define GINAC_NUMERIC_H
 
 #include "basic.h"
 #include "ex.h"
-
-#include <stdexcept>
-#include <vector>
+#include "archive.h"
 
 #include <cln/complex.h>
-
 #if defined(G__CINTVERSION) && !defined(__MAKECINT__)
 // Cint @$#$! doesn't like forward declaring classes used for casting operators
 // so we have to include the definition of cln::cl_N here, but it is enough to
 // do so for the compiler, hence the !defined(__MAKECINT__).
   #include <cln/complex_class.h>
 #endif
+#include <stdexcept>
+#include <vector>
 
 namespace GiNaC {
 
@@ -105,10 +104,11 @@ public:
 public:
 	unsigned precedence() const {return 30;}
 	bool info(unsigned inf) const;
+	bool is_polynomial(const ex & var) const;
 	int degree(const ex & s) const;
 	int ldegree(const ex & s) const;
 	ex coeff(const ex & s, int n = 1) const;
-	bool has(const ex &other) const;
+	bool has(const ex &other, unsigned options = 0) const;
 	ex eval(int level = 0) const;
 	ex evalf(int level = 0) const;
 	ex subs(const exmap & m, unsigned options = 0) const { return subs_one_level(m, options); } // overwrites basic::subs() for performance reasons
@@ -119,6 +119,12 @@ public:
 	ex smod(const numeric &xi) const;
 	numeric max_coefficient() const;
 	ex conjugate() const;
+	ex real_part() const;
+	ex imag_part() const;
+	/** Save (a.k.a. serialize) object into archive. */
+	void archive(archive_node& n) const;
+	/** Read (a.k.a. deserialize) object from archive. */
+	void read_archive(const archive_node& n, lst& syms);
 protected:
 	/** Implementation of ex::diff for a numeric always returns 0.
 	 *  @see ex::diff */
@@ -148,6 +154,7 @@ public:
 	const numeric & operator=(double d);
 	const numeric & operator=(const char *s);
 	const numeric inverse() const;
+	numeric step() const;
 	int csgn() const;
 	int compare(const numeric &other) const;
 	bool is_equal(const numeric &other) const;
@@ -180,7 +187,7 @@ public:
 	const numeric denom() const;
 	int int_length() const;
 	// converting routines for interfacing with CLN:
-	numeric(const cln::cl_N &z);
+	explicit numeric(const cln::cl_N &z);
 
 protected:
 	void print_numeric(const print_context & c, const char *par_open, const char *par_close, const char *imag_sym, const char *mul_sym, unsigned level) const;
@@ -196,6 +203,7 @@ protected:
 protected:
 	cln::cl_N value;
 };
+GINAC_DECLARE_UNARCHIVER(numeric); 
 
 
 // global constants
@@ -250,6 +258,9 @@ inline const numeric pow(const numeric &x, const numeric &y)
 inline const numeric inverse(const numeric &x)
 { return x.inverse(); }
 
+inline numeric step(const numeric &x)
+{ return x.step(); }
+
 inline int csgn(const numeric &x)
 { return x.csgn(); }
 
@@ -259,6 +270,9 @@ inline bool is_zero(const numeric &x)
 inline bool is_positive(const numeric &x)
 { return x.is_positive(); }
 
+inline bool is_negative(const numeric &x)
+{ return x.is_negative(); }
+
 inline bool is_integer(const numeric &x)
 { return x.is_integer(); }
 
@@ -317,14 +331,6 @@ ex EulerEvalf();
 ex CatalanEvalf();
 
 
-// utility functions
-
-/** Specialization of is_exactly_a<numeric>(obj) for numeric objects. */
-template<> inline bool is_exactly_a<numeric>(const basic & obj)
-{
-	return obj.tinfo()==TINFO_numeric;
-}
-
 } // namespace GiNaC
 
 #ifdef __MAKECINT__
@@ -332,4 +338,4 @@ template<> inline bool is_exactly_a<numeric>(const basic & obj)
 #pragma link off defined_in cln/complex_class.h;
 #endif
 
-#endif // ndef __GINAC_NUMERIC_H__
+#endif // ndef GINAC_NUMERIC_H