X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fsymbol.cpp;h=6eedfef3b6142b0fd4e53107ced16ccac916d830;hp=3b3c88202463c5a71d8797741395be5f63641ff8;hb=58a84c0adac7cbaa63a50c06815aed9c7a0bcdcc;hpb=13896261ee985f23e5b5648532e70f0cce704ede

diff --git a/ginac/symbol.cpp b/ginac/symbol.cpp
index 3b3c8820..6eedfef3 100644
--- a/ginac/symbol.cpp
+++ b/ginac/symbol.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's symbolic objects. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2008 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,7 +17,7 @@
  *
  *  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
  */
 
 #include <string>
@@ -28,6 +28,7 @@
 #include "archive.h"
 #include "tostring.h"
 #include "utils.h"
+#include "inifcns.h"
 
 namespace GiNaC {
 
@@ -41,43 +42,105 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(symbol, basic,
 // default constructor
 //////////
 
+// symbol
+
 symbol::symbol()
- : inherited(TINFO_symbol), asexinfop(new assigned_ex_info), serial(next_serial++), name(autoname_prefix() + ToString(serial)), TeX_name(name)
+ : inherited(&symbol::tinfo_static), serial(next_serial++), name(autoname_prefix() + ToString(serial)), TeX_name(name), domain(domain::complex), ret_type(return_types::commutative), ret_type_tinfo(&symbol::tinfo_static)
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
+// realsymbol
+
+realsymbol::realsymbol()
+{
+	domain = domain::real;
+}
+
+// possymbol
+
+possymbol::possymbol()
+{
+	domain = domain::positive;
+}
+
 //////////
 // other constructors
 //////////
 
 // public
 
-symbol::symbol(const std::string & initname)
- : inherited(TINFO_symbol), asexinfop(new assigned_ex_info), serial(next_serial++), name(initname), TeX_name(default_TeX_name())
+// symbol
+
+symbol::symbol(const std::string & initname, unsigned domain)
+ : inherited(&symbol::tinfo_static), serial(next_serial++), name(initname), TeX_name(default_TeX_name()), domain(domain), ret_type(return_types::commutative), ret_type_tinfo(&symbol::tinfo_static)
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
-symbol::symbol(const std::string & initname, const std::string & texname)
- : inherited(TINFO_symbol), asexinfop(new assigned_ex_info), serial(next_serial++), name(initname), TeX_name(texname)
+symbol::symbol(const std::string & initname, unsigned rt, tinfo_t rtt, unsigned domain)
+ : inherited(&symbol::tinfo_static), serial(next_serial++), name(initname), TeX_name(default_TeX_name()), domain(domain), ret_type(rt), ret_type_tinfo(rtt)
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
+symbol::symbol(const std::string & initname, const std::string & texname, unsigned domain)
+ : inherited(&symbol::tinfo_static), serial(next_serial++), name(initname), TeX_name(texname), domain(domain), ret_type(return_types::commutative), ret_type_tinfo(&symbol::tinfo_static)
+{
+	setflag(status_flags::evaluated | status_flags::expanded);
+}
+
+symbol::symbol(const std::string & initname, const std::string & texname, unsigned rt, tinfo_t rtt, unsigned domain)
+ : inherited(&symbol::tinfo_static),  serial(next_serial++), name(initname), TeX_name(texname), domain(domain), ret_type(rt), ret_type_tinfo(rtt)
+{
+	setflag(status_flags::evaluated | status_flags::expanded);
+}
+
+// realsymbol
+	
+realsymbol::realsymbol(const std::string & initname, unsigned domain)
+ : symbol(initname, domain) { }
+
+realsymbol::realsymbol(const std::string & initname, const std::string & texname, unsigned domain)
+ : symbol(initname, texname, domain) { }
+
+realsymbol::realsymbol(const std::string & initname, unsigned rt, tinfo_t rtt, unsigned domain)
+ : symbol(initname, rt, rtt, domain) { }
+
+realsymbol::realsymbol(const std::string & initname, const std::string & texname, unsigned rt, tinfo_t rtt, unsigned domain)
+ : symbol(initname, texname, rt, rtt, domain) { }
+
+// possymbol
+	
+possymbol::possymbol(const std::string & initname, unsigned domain)
+ : symbol(initname, domain) { }
+
+possymbol::possymbol(const std::string & initname, const std::string & texname, unsigned domain)
+ : symbol(initname, texname, domain) { }
+
+possymbol::possymbol(const std::string & initname, unsigned rt, tinfo_t rtt, unsigned domain)
+ : symbol(initname, rt, rtt, domain) { }
+
+possymbol::possymbol(const std::string & initname, const std::string & texname, unsigned rt, tinfo_t rtt, unsigned domain)
+ : symbol(initname, texname, rt, rtt, domain) { }
+
 //////////
 // archiving
 //////////
 
 /** Construct object from archive_node. */
 symbol::symbol(const archive_node &n, lst &sym_lst)
- : inherited(n, sym_lst), asexinfop(new assigned_ex_info), serial(next_serial++)
+ : inherited(n, sym_lst), serial(next_serial++)
 {
-	if (!(n.find_string("name", name)))
+	if (!n.find_string("name", name))
 		name = autoname_prefix() + ToString(serial);
-	if (!(n.find_string("TeXname", TeX_name)))
+	if (!n.find_string("TeXname", TeX_name))
 		TeX_name = default_TeX_name();
-	setflag(status_flags::evaluated);
+	if (!n.find_unsigned("domain", domain))
+		domain = domain::complex;
+	if (!n.find_unsigned("return_type", ret_type))
+		ret_type = return_types::commutative;
+	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
 /** Unarchive the object. */
@@ -103,6 +166,10 @@ void symbol::archive(archive_node &n) const
 	n.add_string("name", name);
 	if (TeX_name != default_TeX_name())
 		n.add_string("TeX_name", TeX_name);
+	if (domain != domain::complex)
+		n.add_unsigned("domain", domain);
+	if (ret_type != return_types::commutative)
+		n.add_unsigned("return_type", ret_type);
 }
 
 //////////
@@ -126,6 +193,7 @@ void symbol::do_print_tree(const print_tree & c, unsigned level) const
 	c.s << std::string(level, ' ') << name << " (" << class_name() << ")" << " @" << this
 	    << ", serial=" << serial
 	    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
+	    << ", domain=" << domain
 	    << std::endl;
 }
 
@@ -139,34 +207,55 @@ void symbol::do_print_python_repr(const print_python_repr & c, unsigned level) c
 
 bool symbol::info(unsigned inf) const
 {
-	if (inf==info_flags::symbol) return true;
-	if (inf==info_flags::polynomial ||
-	    inf==info_flags::integer_polynomial ||
-	    inf==info_flags::cinteger_polynomial ||
-	    inf==info_flags::rational_polynomial ||
-	    inf==info_flags::crational_polynomial ||
-	    inf==info_flags::rational_function)
-		return true;
-	else
-		return inherited::info(inf);
+	switch (inf) {
+		case info_flags::symbol:
+		case info_flags::polynomial:
+		case info_flags::integer_polynomial: 
+		case info_flags::cinteger_polynomial: 
+		case info_flags::rational_polynomial: 
+		case info_flags::crational_polynomial: 
+		case info_flags::rational_function: 
+		case info_flags::expanded:
+			return true;
+		case info_flags::real:
+			return domain == domain::real || domain == domain::positive;
+		case info_flags::positive:
+		case info_flags::nonnegative:
+			return domain == domain::positive;
+		case info_flags::has_indices:
+			return false;
+	}
+	return inherited::info(inf);
 }
 
-ex symbol::eval(int level) const
+ex symbol::conjugate() const
 {
-	if (level == -max_recursion_level)
-		throw(std::runtime_error("max recursion level reached"));
-	
-	if (asexinfop->is_assigned) {
-		setflag(status_flags::evaluated);
-		if (level==1)
-			return (asexinfop->assigned_expression);
-		else
-			return (asexinfop->assigned_expression).eval(level);
+	if (this->domain == domain::complex) {
+		return conjugate_function(*this).hold();
 	} else {
-		return this->hold();
+		return *this;
 	}
 }
 
+ex symbol::real_part() const
+{
+	if (domain==domain::real || domain==domain::positive)
+		return *this;
+	return real_part_function(*this).hold();
+}
+
+ex symbol::imag_part() const
+{
+	if (domain==domain::real || domain==domain::positive)
+		return 0;
+	return imag_part_function(*this).hold();
+}
+
+bool symbol::is_polynomial(const ex & var) const
+{
+	return true;
+}
+
 // protected
 
 /** Implementation of ex::diff() for single differentiation of a symbol.
@@ -198,7 +287,7 @@ bool symbol::is_equal_same_type(const basic & other) const
 
 unsigned symbol::calchash() const
 {
-	hashvalue = golden_ratio_hash(tinfo() ^ serial);
+	hashvalue = golden_ratio_hash((p_int)tinfo() ^ serial);
 	setflag(status_flags::hash_calculated);
 	return hashvalue;
 }
@@ -213,32 +302,14 @@ unsigned symbol::calchash() const
 // non-virtual functions in this class
 //////////
 
-// public
-
-void symbol::assign(const ex & value)
-{
-	asexinfop->is_assigned = true;
-	asexinfop->assigned_expression = value;
-	clearflag(status_flags::evaluated | status_flags::expanded);
-}
-
-void symbol::unassign()
-{
-	if (asexinfop->is_assigned) {
-		asexinfop->is_assigned = false;
-		asexinfop->assigned_expression = _ex0;
-	}
-	setflag(status_flags::evaluated | status_flags::expanded);
-}
-
 // private
 
 /** Symbols not constructed with a string get one assigned using this
  *  prefix and a number. */
-std::string & symbol::autoname_prefix()
+std::string& symbol::autoname_prefix()
 {
-	static std::string *s = new std::string("symbol");
-	return *s;
+	static std::string s("symbol");
+	return s;
 }
 
 /** Return default TeX name for symbol. This recognizes some greek letters. */
@@ -271,13 +342,4 @@ std::string symbol::default_TeX_name() const
 
 unsigned symbol::next_serial = 0;
 
-//////////
-// subclass assigned_ex_info
-//////////
-
-/** Default ctor.  Defaults to unassigned. */
-symbol::assigned_ex_info::assigned_ex_info() : is_assigned(false)
-{
-}
-
 } // namespace GiNaC