X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fsymbol.cpp;h=545524cb055969ad56c4d75c64e1e7f50f421492;hp=6c0c6960769f8a166b615cb80f89c7d13ab6087f;hb=2ee743b3edb44623d5654351beed811d7ad41174;hpb=3ac17e18ada69428fe170c10abcc5f33a30f0676

diff --git a/ginac/symbol.cpp b/ginac/symbol.cpp
index 6c0c6960..545524cb 100644
--- a/ginac/symbol.cpp
+++ b/ginac/symbol.cpp
@@ -45,7 +45,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(symbol, basic,
 // symbol
 
 symbol::symbol()
- : inherited(&symbol::tinfo_static), asexinfop(new assigned_ex_info), serial(next_serial++), name(autoname_prefix() + ToString(serial)), TeX_name(name), ret_type(return_types::commutative), domain(domain::complex)
+ : inherited(&symbol::tinfo_static), asexinfop(new assigned_ex_info), serial(next_serial++), name(autoname_prefix() + ToString(serial)), TeX_name(name), ret_type(return_types::commutative), ret_type_tinfo(&symbol::tinfo_static), domain(domain::complex)
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
@@ -57,6 +57,13 @@ realsymbol::realsymbol()
 	domain = domain::real;
 }
 
+// possymbol
+
+possymbol::possymbol()
+{
+	domain = domain::positive;
+}
+
 //////////
 // other constructors
 //////////
@@ -66,25 +73,25 @@ realsymbol::realsymbol()
 // symbol
 
 symbol::symbol(const std::string & initname, unsigned domain)
- : inherited(&symbol::tinfo_static), asexinfop(new assigned_ex_info), serial(next_serial++), name(initname), TeX_name(default_TeX_name()), ret_type(return_types::commutative), domain(domain)
+ : inherited(&symbol::tinfo_static), asexinfop(new assigned_ex_info), serial(next_serial++), name(initname), TeX_name(default_TeX_name()), ret_type(return_types::commutative), ret_type_tinfo(&symbol::tinfo_static), domain(domain)
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
-symbol::symbol(const std::string & initname, unsigned rt, unsigned domain)
- : inherited(&symbol::tinfo_static), asexinfop(new assigned_ex_info), serial(next_serial++), name(initname), TeX_name(default_TeX_name()), ret_type(rt), domain(domain)
+symbol::symbol(const std::string & initname, unsigned rt, tinfo_t rtt, unsigned domain)
+ : inherited(&symbol::tinfo_static), asexinfop(new assigned_ex_info), serial(next_serial++), name(initname), TeX_name(default_TeX_name()), ret_type(rt), ret_type_tinfo(rtt), domain(domain)
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
 symbol::symbol(const std::string & initname, const std::string & texname, unsigned domain)
- : inherited(&symbol::tinfo_static), asexinfop(new assigned_ex_info), serial(next_serial++), name(initname), TeX_name(texname), ret_type(return_types::commutative), domain(domain)
+ : inherited(&symbol::tinfo_static), asexinfop(new assigned_ex_info), serial(next_serial++), name(initname), TeX_name(texname), ret_type(return_types::commutative), ret_type_tinfo(&symbol::tinfo_static), domain(domain)
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
-symbol::symbol(const std::string & initname, const std::string & texname, unsigned rt, unsigned domain)
- : inherited(&symbol::tinfo_static), asexinfop(new assigned_ex_info), serial(next_serial++), name(initname), TeX_name(texname), ret_type(rt), domain(domain)
+symbol::symbol(const std::string & initname, const std::string & texname, unsigned rt, tinfo_t rtt, unsigned domain)
+ : inherited(&symbol::tinfo_static), asexinfop(new assigned_ex_info), serial(next_serial++), name(initname), TeX_name(texname), ret_type(rt), ret_type_tinfo(rtt), domain(domain)
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
@@ -97,11 +104,25 @@ realsymbol::realsymbol(const std::string & initname, unsigned 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, unsigned domain)
- : symbol(initname, rt, 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) { }
 
-realsymbol::realsymbol(const std::string & initname, const std::string & texname, unsigned rt, unsigned domain)
- : symbol(initname, texname, rt, 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
@@ -196,7 +217,9 @@ bool symbol::info(unsigned inf) const
 	    inf == info_flags::rational_function)
 		return true;
 	if (inf == info_flags::real)
-		return domain == domain::real;
+		return domain==domain::real || domain==domain::positive;
+	if (inf == info_flags::positive || inf == info_flags::nonnegative)
+		return domain == domain::positive;
 	else
 		return inherited::info(inf);
 }
@@ -220,12 +243,31 @@ ex symbol::eval(int level) const
 ex symbol::conjugate() const
 {
 	if (this->domain == domain::complex) {
-		return GiNaC::conjugate_function(*this).hold();
+		return conjugate_function(*this).hold();
 	} else {
 		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.
@@ -257,7 +299,7 @@ bool symbol::is_equal_same_type(const basic & other) const
 
 unsigned symbol::calchash() const
 {
-	hashvalue = golden_ratio_hash((unsigned)tinfo() ^ serial);
+	hashvalue = golden_ratio_hash((p_int)tinfo() ^ serial);
 	setflag(status_flags::hash_calculated);
 	return hashvalue;
 }