X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Ffunction.pl;h=1f944f1a4f9c74a07dc13bb815c34f1dec61a65f;hp=d75e8f645ebf3e359d565067837b31ba60d7a174;hb=f78b1f296310b5f1c01b74c9fb10dd33af2a8f4a;hpb=53fb7ea435cb203ac338274b3f701cecc9ed4b0f diff --git a/ginac/function.pl b/ginac/function.pl index d75e8f64..1f944f1a 100755 --- a/ginac/function.pl +++ b/ginac/function.pl @@ -39,10 +39,9 @@ sub generate { $declare_function_macro = generate( <<'END_OF_DECLARE_FUNCTION_MACRO','typename T${N}','const T${N} & p${N}','GiNaC::ex(p${N})'); #define DECLARE_FUNCTION_${N}P(NAME) \\ -extern const unsigned function_index_##NAME; \\ -template<${SEQ1}> \\ -inline const GiNaC::function NAME(${SEQ2}) { \\ - return GiNaC::function(function_index_##NAME, ${SEQ3}); \\ +class NAME##_SERIAL { public: static unsigned serial; }; \\ +template<${SEQ1}> const GiNaC::function NAME(${SEQ2}) { \\ + return GiNaC::function(NAME##_SERIAL::serial, ${SEQ3}); \\ } END_OF_DECLARE_FUNCTION_MACRO @@ -63,6 +62,10 @@ $typedef_series_funcp=generate( 'typedef ex (* series_funcp_${N})(${SEQ1}, const relational &, int, unsigned);'."\n", 'const ex &','',''); +$typedef_print_funcp=generate( +'typedef void (* print_funcp_${N})(${SEQ1}, const print_context &);'."\n", +'const ex &','',''); + $eval_func_interface=generate(' function_options & eval_func(eval_funcp_${N} e);'."\n",'','',''); $evalf_func_interface=generate(' function_options & evalf_func(evalf_funcp_${N} ef);'."\n",'','',''); @@ -71,6 +74,16 @@ $derivative_func_interface=generate(' function_options & derivative_func(deri $series_func_interface=generate(' function_options & series_func(series_funcp_${N} s);'."\n",'','',''); +$print_func_interface=generate( + <<'END_OF_PRINT_FUNC_INTERFACE','','',''); + template function_options & print_func(print_funcp_${N} p) + { + test_and_set_nparams(${N}); + set_print_func(Ctx::get_class_info_static().options.get_id(), print_funcp(p)); + return *this; + } +END_OF_PRINT_FUNC_INTERFACE + $constructors_interface=generate( ' function(unsigned ser, ${SEQ1});'."\n", 'const ex & param${N}','',''); @@ -87,33 +100,40 @@ END_OF_CONSTRUCTORS_IMPLEMENTATION $eval_switch_statement=generate( <<'END_OF_EVAL_SWITCH_STATEMENT','seq[${N}-1]','',''); case ${N}: - eval_result = ((eval_funcp_${N})(registered_functions()[serial].eval_f))(${SEQ1}); + eval_result = ((eval_funcp_${N})(opt.eval_f))(${SEQ1}); break; END_OF_EVAL_SWITCH_STATEMENT $evalf_switch_statement=generate( <<'END_OF_EVALF_SWITCH_STATEMENT','eseq[${N}-1]','',''); case ${N}: - return ((evalf_funcp_${N})(registered_functions()[serial].evalf_f))(${SEQ1}); + return ((evalf_funcp_${N})(opt.evalf_f))(${SEQ1}); END_OF_EVALF_SWITCH_STATEMENT $diff_switch_statement=generate( <<'END_OF_DIFF_SWITCH_STATEMENT','seq[${N}-1]','',''); case ${N}: - return ((derivative_funcp_${N})(registered_functions()[serial].derivative_f))(${SEQ1},diff_param); + return ((derivative_funcp_${N})(opt.derivative_f))(${SEQ1},diff_param); END_OF_DIFF_SWITCH_STATEMENT $series_switch_statement=generate( <<'END_OF_SERIES_SWITCH_STATEMENT','seq[${N}-1]','',''); case ${N}: try { - res = ((series_funcp_${N})(registered_functions()[serial].series_f))(${SEQ1},r,order,options); + res = ((series_funcp_${N})(opt.series_f))(${SEQ1},r,order,options); } catch (do_taylor) { res = basic::series(r, order, options); } return res; END_OF_SERIES_SWITCH_STATEMENT +$print_switch_statement=generate( + <<'END_OF_PRINT_SWITCH_STATEMENT','seq[${N}-1]','',''); + case ${N}: + ((print_funcp_${N})(pdt[id]))(${SEQ1}, c); + break; +END_OF_PRINT_SWITCH_STATEMENT + $eval_func_implementation=generate( <<'END_OF_EVAL_FUNC_IMPLEMENTATION','','',''); function_options & function_options::eval_func(eval_funcp_${N} e) @@ -164,7 +184,7 @@ $interface=< function_options & print_func(print_funcp_exvector p) + { + print_use_exvector_args = true; + set_print_func(Ctx::get_class_info_static().options.get_id(), print_funcp(p)); + return *this; + } + function_options & set_return_type(unsigned rt, unsigned rtt=0); - function_options & do_not_evalf_params(void); + function_options & do_not_evalf_params(); function_options & remember(unsigned size, unsigned assoc_size=0, unsigned strategy=remember_strategies::delete_never); function_options & overloaded(unsigned o); function_options & set_symmetry(const symmetry & s); - void test_and_set_nparams(unsigned n); - std::string get_name(void) const { return name; } - unsigned get_nparams(void) const { return nparams; } - bool has_derivative(void) const { return derivative_f != NULL; } + + std::string get_name() const { return name; } + unsigned get_nparams() const { return nparams; } protected: + bool has_derivative() const { return derivative_f != NULL; } + void test_and_set_nparams(unsigned n); + void set_print_func(unsigned id, print_funcp f); + std::string name; std::string TeX_name; @@ -267,6 +302,7 @@ protected: evalf_funcp evalf_f; derivative_funcp derivative_f; series_funcp series_f; + std::vector print_dispatch_table; bool evalf_params_first; @@ -283,12 +319,19 @@ protected: bool evalf_use_exvector_args; bool derivative_use_exvector_args; bool series_use_exvector_args; + bool print_use_exvector_args; unsigned functions_with_same_name; ex symtree; }; + +/** Exception class thrown by classes which provide their own series expansion + * to signal that ordinary Taylor expansion is safe. */ +class do_taylor {}; + + /** The class function is used to implement builtin functions like sin, cos... and user defined functions */ class function : public exprseq @@ -297,7 +340,7 @@ class function : public exprseq // CINT has a linking problem #ifndef __MAKECINT__ - friend void ginsh_get_ginac_functions(void); + friend void ginsh_get_ginac_functions(); #endif // def __MAKECINT__ friend class remember_table_entry; @@ -306,7 +349,7 @@ class function : public exprseq // member functions - // other ctors + // other constructors public: function(unsigned ser); // the following lines have been generated for max. ${maxargs} parameters @@ -314,25 +357,25 @@ $constructors_interface // end of generated lines function(unsigned ser, const exprseq & es); function(unsigned ser, const exvector & v, bool discardable = false); - function(unsigned ser, exvector * vp); // vp will be deleted + function(unsigned ser, std::auto_ptr vp); // functions overriding virtual functions from base classes public: void print(const print_context & c, unsigned level = 0) const; - unsigned precedence(void) const {return 70;} + unsigned precedence() const {return 70;} ex expand(unsigned options=0) const; ex eval(int level=0) const; ex evalf(int level=0) const; - unsigned calchash(void) const; + unsigned calchash() const; ex series(const relational & r, int order, unsigned options = 0) const; - ex thisexprseq(const exvector & v) const; - ex thisexprseq(exvector * vp) const; + ex thiscontainer(const exvector & v) const; + ex thiscontainer(std::auto_ptr vp) const; protected: ex derivative(const symbol & s) const; bool is_equal_same_type(const basic & other) const; bool match_same_type(const basic & other) const; - unsigned return_type(void) const; - unsigned return_type_tinfo(void) const; + unsigned return_type() const; + unsigned return_type_tinfo() const; // new virtual functions which can be overridden by derived classes // none @@ -340,15 +383,15 @@ protected: // non-virtual functions in this class protected: ex pderivative(unsigned diff_param) const; // partial differentiation - static std::vector & registered_functions(void); + static std::vector & registered_functions(); bool lookup_remember_table(ex & result) const; void store_remember_table(ex const & result) const; public: static unsigned register_new(function_options const & opt); static unsigned current_serial; static unsigned find_function(const std::string &name, unsigned nparams); - unsigned get_serial(void) const {return serial;} - std::string get_name(void) const; + unsigned get_serial() const {return serial;} + std::string get_name() const; // member variables @@ -364,8 +407,15 @@ template<> inline bool is_exactly_a(const basic & obj) return obj.tinfo()==TINFO_function; } -#define is_ex_the_function(OBJ, FUNCNAME) \\ - (GiNaC::is_exactly_a(OBJ) && GiNaC::ex_to(OBJ).get_serial() == function_index_##FUNCNAME) +template +inline bool is_the_function(const ex & x) +{ + return is_exactly_a(x) + && ex_to(x).get_serial() == T::serial; +} + +// Check whether OBJ is the specified symbolic function. +#define is_ex_the_function(OBJ, FUNCNAME) (GiNaC::is_the_function(OBJ)) } // namespace GiNaC @@ -383,7 +433,7 @@ $implementation=< #include "function.h" +#include "operators.h" #include "fderivative.h" #include "ex.h" #include "lst.h" @@ -439,7 +490,7 @@ function_options::~function_options() // nothing to clean up at the moment } -void function_options::initialize(void) +void function_options::initialize() { set_name("unnamed_function","\\\\mbox{unnamed}"); nparams = 0; @@ -450,6 +501,7 @@ void function_options::initialize(void) evalf_use_exvector_args = false; derivative_use_exvector_args = false; series_use_exvector_args = false; + print_use_exvector_args = false; use_remember = false; functions_with_same_name = 1; symtree = 0; @@ -504,7 +556,6 @@ function_options& function_options::series_func(series_funcp_exvector s) return *this; } - function_options & function_options::set_return_type(unsigned rt, unsigned rtt) { use_return_type = true; @@ -513,7 +564,7 @@ function_options & function_options::set_return_type(unsigned rt, unsigned rtt) return *this; } -function_options & function_options::do_not_evalf_params(void) +function_options & function_options::do_not_evalf_params() { evalf_params_first = false; return *this; @@ -549,13 +600,20 @@ void function_options::test_and_set_nparams(unsigned n) } else if (nparams!=n) { // we do not throw an exception here because this code is // usually executed before main(), so the exception could not - // caught anyhow - std::cerr << "WARNING: number of parameters (" + // be caught anyhow + std::cerr << "WARNING: " << name << "(): number of parameters (" << n << ") differs from number set before (" << nparams << ")" << std::endl; } } +void function_options::set_print_func(unsigned id, print_funcp f) +{ + if (id >= print_dispatch_table.size()) + print_dispatch_table.resize(id + 1); + print_dispatch_table[id] = f; +} + /** This can be used as a hook for external applications. */ unsigned function::current_serial = 0; @@ -563,7 +621,7 @@ unsigned function::current_serial = 0; GINAC_IMPLEMENT_REGISTERED_CLASS(function, exprseq) ////////// -// default ctor, dtor, copy ctor, assignment operator and helpers +// default constructor ////////// // public @@ -573,22 +631,8 @@ function::function() : serial(0) tinfo_key = TINFO_function; } -// protected - -void function::copy(const function & other) -{ - inherited::copy(other); - serial = other.serial; -} - -void function::destroy(bool call_parent) -{ - if (call_parent) - inherited::destroy(call_parent); -} - ////////// -// other ctors +// other constructors ////////// // public @@ -605,6 +649,10 @@ $constructors_implementation function::function(unsigned ser, const exprseq & es) : exprseq(es), serial(ser) { tinfo_key = TINFO_function; + + // Force re-evaluation even if the exprseq was already evaluated + // (the exprseq copy constructor copies the flags) + clearflag(status_flags::evaluated); } function::function(unsigned ser, const exvector & v, bool discardable) @@ -613,7 +661,7 @@ function::function(unsigned ser, const exvector & v, bool discardable) tinfo_key = TINFO_function; } -function::function(unsigned ser, exvector * vp) +function::function(unsigned ser, std::auto_ptr vp) : exprseq(vp), serial(ser) { tinfo_key = TINFO_function; @@ -624,7 +672,7 @@ function::function(unsigned ser, exvector * vp) ////////// /** Construct object from archive_node. */ -function::function(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) +function::function(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) { // Find serial number by function name std::string s; @@ -644,7 +692,7 @@ function::function(const archive_node &n, const lst &sym_lst) : inherited(n, sym } /** Unarchive the object. */ -ex function::unarchive(const archive_node &n, const lst &sym_lst) +ex function::unarchive(const archive_node &n, lst &sym_lst) { return (new function(n, sym_lst))->setflag(status_flags::dynallocated); } @@ -666,44 +714,67 @@ void function::archive(archive_node &n) const void function::print(const print_context & c, unsigned level) const { GINAC_ASSERT(serial &pdt = opt.print_dispatch_table; - if (is_of_type(c, print_tree)) { - - c.s << std::string(level, ' ') << class_name() << " " - << registered_functions()[serial].name - << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec - << ", nops=" << nops() - << std::endl; - unsigned delta_indent = static_cast(c).delta_indent; - for (unsigned i=0; ioptions.get_id(); + if (id >= pdt.size() || pdt[id] == NULL) { - // Print function name in lowercase - std::string lname = registered_functions()[serial].name; - unsigned num = lname.size(); - for (unsigned i=0; iget_parent(); + if (parent_pc_info) { + pc_info = parent_pc_info; + goto next_context; + } - // Print arguments, separated by commas - exvector::const_iterator it = seq.begin(), itend = seq.end(); - while (it != itend) { - it->print(c); - ++it; - if (it != itend) - c.s << ","; + // Method still not found, use default output + if (is_a(c)) { + + c.s << std::string(level, ' ') << class_name() << " " + << opt.name << " @" << this + << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec + << ", nops=" << nops() + << std::endl; + unsigned delta_indent = static_cast(c).delta_indent; + for (size_t i=0; i(c)) { + + // Print function name in lowercase + std::string lname = opt.name; + size_t num = lname.size(); + for (size_t i=0; i(c)) { + c.s << opt.TeX_name; + printseq(c, '(', ',', ')', exprseq::precedence(), function::precedence()); + } else { + c.s << opt.name; + printseq(c, '(', ',', ')', exprseq::precedence(), function::precedence()); } - c.s << ")"; - } else if (is_of_type(c, print_latex)) { - c.s << registered_functions()[serial].TeX_name; - printseq(c, '(', ',', ')', exprseq::precedence(), function::precedence()); } else { - c.s << registered_functions()[serial].name; - printseq(c, '(', ',', ')', exprseq::precedence(), function::precedence()); + + // Method found, call it + current_serial = serial; + if (opt.print_use_exvector_args) + ((print_funcp_exvector)pdt[id])(seq, c); + else switch (opt.nparams) { + // the following lines have been generated for max. ${maxargs} parameters +${print_switch_statement} + // end of generated lines + default: + throw(std::logic_error("function::print(): invalid nparams")); + } } } @@ -718,13 +789,12 @@ ex function::expand(unsigned options) const ex function::eval(int level) const { - GINAC_ASSERT(serial1) { // first evaluate children, then we will end up here again return function(serial,evalchildren(level)); } + GINAC_ASSERT(serialevalf(level)); - ++it; + --level; + exvector::const_iterator it = seq.begin(), itend = seq.end(); + while (it != itend) { + eseq.push_back(it->evalf(level)); + ++it; + } } - - if (registered_functions()[serial].evalf_f==0) { + + if (opt.evalf_f==0) { return function(serial,eseq).hold(); } current_serial = serial; - if (registered_functions()[serial].evalf_use_exvector_args) - return ((evalf_funcp_exvector)(registered_functions()[serial].evalf_f))(seq); - switch (registered_functions()[serial].nparams) { + if (opt.evalf_use_exvector_args) + return ((evalf_funcp_exvector)(opt.evalf_f))(seq); + switch (opt.nparams) { // the following lines have been generated for max. ${maxargs} parameters ${evalf_switch_statement} // end of generated lines @@ -799,14 +871,14 @@ ${evalf_switch_statement} throw(std::logic_error("function::evalf(): invalid nparams")); } -unsigned function::calchash(void) const +unsigned function::calchash() const { unsigned v = golden_ratio_hash(golden_ratio_hash(tinfo()) ^ serial); - for (unsigned i=0; iop(i).gethash(); } - v &= 0x7FFFFFFFU; + if (flags & status_flags::evaluated) { setflag(status_flags::hash_calculated); hashvalue = v; @@ -814,14 +886,14 @@ unsigned function::calchash(void) const return v; } -ex function::thisexprseq(const exvector & v) const +ex function::thiscontainer(const exvector & v) const { - return function(serial,v); + return function(serial, v); } -ex function::thisexprseq(exvector * vp) const +ex function::thiscontainer(std::auto_ptr vp) const { - return function(serial,vp); + return function(serial, vp); } /** Implementation of ex::series for functions. @@ -829,21 +901,22 @@ ex function::thisexprseq(exvector * vp) const ex function::series(const relational & r, int order, unsigned options) const { GINAC_ASSERT(serial(other)); const function & o = static_cast(other); if (serial != o.serial) @@ -894,7 +967,7 @@ int function::compare_same_type(const basic & other) const bool function::is_equal_same_type(const basic & other) const { - GINAC_ASSERT(is_of_type(other, function)); + GINAC_ASSERT(is_a(other)); const function & o = static_cast(other); if (serial != o.serial) @@ -905,26 +978,46 @@ bool function::is_equal_same_type(const basic & other) const bool function::match_same_type(const basic & other) const { - GINAC_ASSERT(is_of_type(other, function)); + GINAC_ASSERT(is_a(other)); const function & o = static_cast(other); return serial == o.serial; } -unsigned function::return_type(void) const +unsigned function::return_type() const { - if (seq.empty()) - return return_types::commutative; - else - return seq.begin()->return_type(); + GINAC_ASSERT(serialreturn_type(); + } } -unsigned function::return_type_tinfo(void) const +unsigned function::return_type_tinfo() const { - if (seq.empty()) - return tinfo_key; - else - return seq.begin()->return_type_tinfo(); + GINAC_ASSERT(serialreturn_type_tinfo(); + } } ////////// @@ -942,15 +1035,16 @@ unsigned function::return_type_tinfo(void) const ex function::pderivative(unsigned diff_param) const // partial differentiation { GINAC_ASSERT(serial & function::registered_functions(void) +std::vector & function::registered_functions() { static std::vector * rf = new std::vector; return *rf; @@ -966,20 +1060,20 @@ std::vector & function::registered_functions(void) bool function::lookup_remember_table(ex & result) const { - return remember_table::remember_tables()[serial].lookup_entry(*this,result); + return remember_table::remember_tables()[this->serial].lookup_entry(*this,result); } void function::store_remember_table(ex const & result) const { - remember_table::remember_tables()[serial].add_entry(*this,result); + remember_table::remember_tables()[this->serial].add_entry(*this,result); } // public unsigned function::register_new(function_options const & opt) { - unsigned same_name = 0; - for (unsigned i=0; i