X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Ffunction.pl;h=b72a62c1ca111f52bc125d26e2e894148958827c;hp=b583a76b639c896a0e65624b2e5b08c34013687d;hb=af6809f55c95cf6ea6ef80bd1d19637a06f32e5a;hpb=9e2d60e206395fc9908e1f9025e50c76b3d7c182 diff --git a/ginac/function.pl b/ginac/function.pl index b583a76b..b72a62c1 100755 --- a/ginac/function.pl +++ b/ginac/function.pl @@ -15,132 +15,96 @@ sub generate_seq { } sub generate_from_to { - my ($template,$seq_template1,$seq_template2,$from,$to)=@_; + my ($template,$seq_template1,$seq_template2,$seq_template3,$from,$to)=@_; my ($res,$N,$SEQ); $res=''; for ($N=$from; $N<=$to; $N++) { $SEQ1=generate_seq($seq_template1,$N); $SEQ2=generate_seq($seq_template2,$N); + $SEQ3=generate_seq($seq_template3,$N); $res .= eval('"' . $template . '"'); $SEQ1=''; # to avoid main::SEQ1 used only once warning $SEQ2=''; # same as above + $SEQ3=''; # same as above } return $res; } sub generate { - my ($template,$seq_template1,$seq_template2)=@_; - return generate_from_to($template,$seq_template1,$seq_template2,1,$maxargs); + my ($template,$seq_template1,$seq_template2,$seq_template3)=@_; + return generate_from_to($template,$seq_template1,$seq_template2,$seq_template3,1,$maxargs); } -$declare_function_macro_namespace = <<'END_OF_DECLARE_FUNCTION_1_AND_2P_MACRO_NAMESPACE'; -#define DECLARE_FUNCTION_1P(NAME) \ -extern const unsigned function_index_##NAME; \ -inline GiNaC::function NAME(const GiNaC::ex & p1) { \ - return GiNaC::function(function_index_##NAME, p1); \ -} -#define DECLARE_FUNCTION_2P(NAME) \ -extern const unsigned function_index_##NAME; \ -inline GiNaC::function NAME(const GiNaC::ex & p1, const GiNaC::ex & p2) { \ - return GiNaC::function(function_index_##NAME, p1, p2); \ -} - -END_OF_DECLARE_FUNCTION_1_AND_2P_MACRO_NAMESPACE - -$declare_function_macro_namespace .= generate_from_to( - <<'END_OF_DECLARE_FUNCTION_MACRO_NAMESPACE','const GiNaC::ex & p${N}','p${N}',3,$maxargs); -#define DECLARE_FUNCTION_${N}P(NAME) \\ -extern const unsigned function_index_##NAME; \\ -inline GiNaC::function NAME(${SEQ1}) { \\ - return GiNaC::function(function_index_##NAME, ${SEQ2}); \\ -} - -END_OF_DECLARE_FUNCTION_MACRO_NAMESPACE - -$declare_function_macro_no_namespace = <<'END_OF_DECLARE_FUNCTION_1_AND_2P_MACRO_NO_NAMESPACE'; -#define DECLARE_FUNCTION_1P(NAME) \ -extern const unsigned function_index_##NAME; \ -inline function NAME(const ex & p1) { \ - return function(function_index_##NAME, p1); \ -} -#define DECLARE_FUNCTION_2P(NAME) \ -extern const unsigned function_index_##NAME; \ -inline function NAME(const ex & p1, const ex & p2) { \ - return function(function_index_##NAME, p1, p2); \ -} - -END_OF_DECLARE_FUNCTION_1_AND_2P_MACRO_NO_NAMESPACE - -$declare_function_macro_no_namespace .= generate_from_to( - <<'END_OF_DECLARE_FUNCTION_MACRO_NO_NAMESPACE','const ex & p${N}','p${N}',3,$maxargs); +$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; \\ -inline function NAME(${SEQ1}) { \\ - return function(function_index_##NAME, ${SEQ2}); \\ +template<${SEQ1}> \\ +inline const GiNaC::function NAME(${SEQ2}) { \\ + return GiNaC::function(function_index_##NAME, ${SEQ3}); \\ } -END_OF_DECLARE_FUNCTION_MACRO_NO_NAMESPACE +END_OF_DECLARE_FUNCTION_MACRO $typedef_eval_funcp=generate( 'typedef ex (* eval_funcp_${N})(${SEQ1});'."\n", -'const ex &',''); +'const ex &','',''); $typedef_evalf_funcp=generate( 'typedef ex (* evalf_funcp_${N})(${SEQ1});'."\n", -'const ex &',''); +'const ex &','',''); $typedef_derivative_funcp=generate( 'typedef ex (* derivative_funcp_${N})(${SEQ1}, unsigned);'."\n", -'const ex &',''); +'const ex &','',''); $typedef_series_funcp=generate( 'typedef ex (* series_funcp_${N})(${SEQ1}, const relational &, int, unsigned);'."\n", -'const ex &',''); +'const ex &','',''); -$eval_func_interface=generate(' function_options & eval_func(eval_funcp_${N} e);'."\n",'',''); +$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",'',''); +$evalf_func_interface=generate(' function_options & evalf_func(evalf_funcp_${N} ef);'."\n",'','',''); -$derivative_func_interface=generate(' function_options & derivative_func(derivative_funcp_${N} d);'."\n",'',''); +$derivative_func_interface=generate(' function_options & derivative_func(derivative_funcp_${N} d);'."\n",'','',''); -$series_func_interface=generate(' function_options & series_func(series_funcp_${N} s);'."\n",'',''); +$series_func_interface=generate(' function_options & series_func(series_funcp_${N} s);'."\n",'','',''); $constructors_interface=generate( ' function(unsigned ser, ${SEQ1});'."\n", -'const ex & param${N}',''); +'const ex & param${N}','',''); $constructors_implementation=generate( - <<'END_OF_CONSTRUCTORS_IMPLEMENTATION','const ex & param${N}','param${N}'); + <<'END_OF_CONSTRUCTORS_IMPLEMENTATION','const ex & param${N}','param${N}',''); function::function(unsigned ser, ${SEQ1}) : exprseq(${SEQ2}), serial(ser) { - debugmsg(\"function constructor from unsigned,${N}*ex\",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_function; } END_OF_CONSTRUCTORS_IMPLEMENTATION $eval_switch_statement=generate( - <<'END_OF_EVAL_SWITCH_STATEMENT','seq[${N}-1]',''); + <<'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})(registered_functions()[serial].eval_f))(${SEQ1}); break; END_OF_EVAL_SWITCH_STATEMENT $evalf_switch_statement=generate( - <<'END_OF_EVALF_SWITCH_STATEMENT','eseq[${N}-1]',''); + <<'END_OF_EVALF_SWITCH_STATEMENT','eseq[${N}-1]','',''); case ${N}: return ((evalf_funcp_${N})(registered_functions()[serial].evalf_f))(${SEQ1}); END_OF_EVALF_SWITCH_STATEMENT $diff_switch_statement=generate( - <<'END_OF_DIFF_SWITCH_STATEMENT','seq[${N}-1]',''); + <<'END_OF_DIFF_SWITCH_STATEMENT','seq[${N}-1]','',''); case ${N}: return ((derivative_funcp_${N})(registered_functions()[serial].derivative_f))(${SEQ1},diff_param); END_OF_DIFF_SWITCH_STATEMENT $series_switch_statement=generate( - <<'END_OF_SERIES_SWITCH_STATEMENT','seq[${N}-1]',''); + <<'END_OF_SERIES_SWITCH_STATEMENT','seq[${N}-1]','',''); case ${N}: try { res = ((series_funcp_${N})(registered_functions()[serial].series_f))(${SEQ1},r,order,options); @@ -151,56 +115,56 @@ $series_switch_statement=generate( END_OF_SERIES_SWITCH_STATEMENT $eval_func_implementation=generate( - <<'END_OF_EVAL_FUNC_IMPLEMENTATION','',''); + <<'END_OF_EVAL_FUNC_IMPLEMENTATION','','',''); function_options & function_options::eval_func(eval_funcp_${N} e) { test_and_set_nparams(${N}); - eval_f=eval_funcp(e); + eval_f = eval_funcp(e); return *this; -} +} END_OF_EVAL_FUNC_IMPLEMENTATION $evalf_func_implementation=generate( - <<'END_OF_EVALF_FUNC_IMPLEMENTATION','',''); + <<'END_OF_EVALF_FUNC_IMPLEMENTATION','','',''); function_options & function_options::evalf_func(evalf_funcp_${N} ef) { test_and_set_nparams(${N}); - evalf_f=evalf_funcp(ef); + evalf_f = evalf_funcp(ef); return *this; -} +} END_OF_EVALF_FUNC_IMPLEMENTATION $derivative_func_implementation=generate( - <<'END_OF_DERIVATIVE_FUNC_IMPLEMENTATION','',''); + <<'END_OF_DERIVATIVE_FUNC_IMPLEMENTATION','','',''); function_options & function_options::derivative_func(derivative_funcp_${N} d) { test_and_set_nparams(${N}); - derivative_f=derivative_funcp(d); + derivative_f = derivative_funcp(d); return *this; -} +} END_OF_DERIVATIVE_FUNC_IMPLEMENTATION $series_func_implementation=generate( - <<'END_OF_SERIES_FUNC_IMPLEMENTATION','',''); + <<'END_OF_SERIES_FUNC_IMPLEMENTATION','','',''); function_options & function_options::series_func(series_funcp_${N} s) { test_and_set_nparams(${N}); - series_f=series_funcp(s); + series_f = series_funcp(s); return *this; -} +} END_OF_SERIES_FUNC_IMPLEMENTATION $interface=< #include -// CINT needs to work properly with +// CINT needs to work properly with #include #include "exprseq.h" -#ifndef NO_NAMESPACE_GINAC - -// the following lines have been generated for max. ${maxargs} parameters -$declare_function_macro_namespace -// end of generated lines - -#else // ndef NO_NAMESPACE_GINAC - // the following lines have been generated for max. ${maxargs} parameters -$declare_function_macro_no_namespace +$declare_function_macro // end of generated lines -#endif // ndef NO_NAMESPACE_GINAC - -#ifndef NO_NAMESPACE_GINAC - #define REGISTER_FUNCTION(NAME,OPT) \\ const unsigned function_index_##NAME= \\ GiNaC::function::register_new(GiNaC::function_options(#NAME).OPT); -#define REGISTER_FUNCTION_OLD(NAME,E,EF,D,S) \\ -const unsigned function_index_##NAME= \\ - GiNaC::function::register_new(GiNaC::function_options(#NAME). \\ - eval_func(E). \\ - evalf_func(EF). \\ - derivative_func(D). \\ - series_func(S)); - -#else // ndef NO_NAMESPACE_GINAC - -#define REGISTER_FUNCTION(NAME,OPT) \\ -const unsigned function_index_##NAME= \\ - function::register_new(function_options(#NAME).OPT); - -#define REGISTER_FUNCTION_OLD(NAME,E,EF,D,S) \\ -const unsigned function_index_##NAME= \\ - function::register_new(function_options(#NAME). \\ - eval_func(E). \\ - evalf_func(EF). \\ - derivative_func(D). \\ - series_func(S)); - -#endif // ndef NO_NAMESPACE_GINAC - -#define BEGIN_TYPECHECK \\ -bool automatic_typecheck=true; - -#define TYPECHECK(VAR,TYPE) \\ -if (!is_ex_exactly_of_type(VAR,TYPE)) { \\ - automatic_typecheck=false; \\ -} else - -#ifndef NO_NAMESPACE_GINAC - -#define TYPECHECK_INTEGER(VAR) \\ -if (!(VAR).info(GiNaC::info_flags::integer)) { \\ - automatic_typecheck=false; \\ -} else - -#else // ndef NO_NAMESPACE_GINAC - -#define TYPECHECK_INTEGER(VAR) \\ -if (!(VAR).info(info_flags::integer)) { \\ - automatic_typecheck=false; \\ -} else - -#endif // ndef NO_NAMESPACE_GINAC - -#define END_TYPECHECK(RV) \\ -{} \\ -if (!automatic_typecheck) { \\ - return RV.hold(); \\ -} - -#ifndef NO_NAMESPACE_GINAC namespace GiNaC { -#endif // ndef NO_NAMESPACE_GINAC class function; +class symmetry; typedef ex (* eval_funcp)(); typedef ex (* evalf_funcp)(); @@ -320,29 +217,45 @@ $typedef_derivative_funcp $typedef_series_funcp // end of generated lines +// Alternatively, an exvector may be passed into the static function, instead +// of individual ex objects. Then, the number of arguments is not limited. +typedef ex (* eval_funcp_exvector)(const exvector &); +typedef ex (* evalf_funcp_exvector)(const exvector &); +typedef ex (* derivative_funcp_exvector)(const exvector &, unsigned); +typedef ex (* series_funcp_exvector)(const exvector &, const relational &, int, unsigned); + class function_options { friend class function; + friend class fderivative; public: function_options(); function_options(std::string const & n, std::string const & tn=std::string()); ~function_options(); void initialize(void); function_options & set_name(std::string const & n, std::string const & tn=std::string()); + function_options & latex_name(std::string const & tn); // the following lines have been generated for max. ${maxargs} parameters $eval_func_interface $evalf_func_interface $derivative_func_interface $series_func_interface // end of generated lines + function_options & eval_func(eval_funcp_exvector e); + function_options & evalf_func(evalf_funcp_exvector ef); + function_options & derivative_func(derivative_funcp_exvector d); + function_options & series_func(series_funcp_exvector s); + function_options & set_return_type(unsigned rt, unsigned rtt=0); function_options & do_not_evalf_params(void); 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; } protected: std::string name; @@ -366,7 +279,14 @@ protected: unsigned remember_assoc_size; unsigned remember_strategy; + bool eval_use_exvector_args; + bool evalf_use_exvector_args; + bool derivative_use_exvector_args; + bool series_use_exvector_args; + unsigned functions_with_same_name; + + ex symtree; }; /** The class function is used to implement builtin functions like sin, cos... @@ -386,43 +306,31 @@ class function : public exprseq // member functions - // default constructor, destructor, copy constructor assignment operator and helpers -public: - function(); - ~function(); - function(const function & other); - const function & operator=(const function & other); -protected: - void copy(const function & other); - void destroy(bool call_parent); - - // other constructors + // other ctors public: function(unsigned ser); // the following lines have been generated for max. ${maxargs} parameters $constructors_interface // end of generated lines function(unsigned ser, const exprseq & es); - function(unsigned ser, const exvector & v, bool discardable=0); + function(unsigned ser, const exvector & v, bool discardable = false); function(unsigned ser, exvector * vp); // vp will be deleted - // functions overriding virtual functions from bases classes + // functions overriding virtual functions from base classes public: - basic * duplicate() const; - void printraw(std::ostream & os) const; - void print(std::ostream & os, unsigned upper_precedence=0) const; - void printtree(std::ostream & os, unsigned indent) const; - void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence=0) const; + void print(const print_context & c, unsigned level = 0) const; + unsigned precedence(void) 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; ex series(const relational & r, int order, unsigned options = 0) const; ex thisexprseq(const exvector & v) const; ex thisexprseq(exvector * vp) const; protected: ex derivative(const symbol & s) const; - int compare_same_type(const basic & other) 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; @@ -437,9 +345,11 @@ protected: 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 getserial(void) const {return serial;} - + unsigned get_serial(void) const {return serial;} + std::string get_name(void) const; + // member variables protected: @@ -447,31 +357,17 @@ protected: }; // utility functions/macros -inline const function &ex_to_function(const ex &e) + +/** Specialization of is_exactly_a(obj) for objects of type function. */ +template<> inline bool is_exactly_a(const basic & obj) { - return static_cast(*e.bp); + return obj.tinfo()==TINFO_function; } -#ifndef NO_NAMESPACE_GINAC - -#define is_ex_the_function(OBJ, FUNCNAME) \\ - (is_ex_exactly_of_type(OBJ, function) && static_cast(OBJ.bp)->getserial() == function_index_##FUNCNAME) - -#else // ndef NO_NAMESPACE_GINAC - #define is_ex_the_function(OBJ, FUNCNAME) \\ - (is_ex_exactly_of_type(OBJ, function) && static_cast(OBJ.bp)->getserial() == function_index_##FUNCNAME) - -#endif // ndef NO_NAMESPACE_GINAC - -// global constants + (GiNaC::is_exactly_a(OBJ) && GiNaC::ex_to(OBJ).get_serial() == function_index_##FUNCNAME) -extern const function some_function; -extern const std::type_info & typeid_function; - -#ifndef NO_NAMESPACE_GINAC } // namespace GiNaC -#endif // ndef NO_NAMESPACE_GINAC #endif // ndef __GINAC_FUNCTION_H__ @@ -480,14 +376,14 @@ END_OF_INTERFACE $implementation=< #include #include #include #include "function.h" +#include "fderivative.h" #include "ex.h" #include "lst.h" +#include "symmetry.h" +#include "print.h" #include "archive.h" #include "inifcns.h" +#include "tostring.h" #include "utils.h" -#include "debugmsg.h" #include "remember.h" -#ifndef NO_NAMESPACE_GINAC namespace GiNaC { -#endif // ndef NO_NAMESPACE_GINAC ////////// // helper class function_options @@ -543,24 +441,34 @@ function_options::~function_options() void function_options::initialize(void) { - set_name("unnamed_function","\\\\operatorname{unnamed}"); - nparams=0; - eval_f=evalf_f=derivative_f=series_f=0; - evalf_params_first=true; - use_return_type=false; - use_remember=false; - functions_with_same_name=1; + set_name("unnamed_function","\\\\mbox{unnamed}"); + nparams = 0; + eval_f = evalf_f = derivative_f = series_f = 0; + evalf_params_first = true; + use_return_type = false; + eval_use_exvector_args = false; + evalf_use_exvector_args = false; + derivative_use_exvector_args = false; + series_use_exvector_args = false; + use_remember = false; + functions_with_same_name = 1; + symtree = 0; } function_options & function_options::set_name(std::string const & n, std::string const & tn) { - name=n; - if (tn==std::string()) { - TeX_name="\\\\operatorname{"+name+"}"; - } else { - TeX_name=tn; - } + name = n; + if (tn==std::string()) + TeX_name = "\\\\mbox{"+name+"}"; + else + TeX_name = tn; + return *this; +} + +function_options & function_options::latex_name(std::string const & tn) +{ + TeX_name = tn; return *this; } @@ -571,17 +479,42 @@ $derivative_func_implementation $series_func_implementation // end of generated lines +function_options& function_options::eval_func(eval_funcp_exvector e) +{ + eval_use_exvector_args = true; + eval_f = eval_funcp(e); + return *this; +} +function_options& function_options::evalf_func(evalf_funcp_exvector ef) +{ + evalf_use_exvector_args = true; + evalf_f = evalf_funcp(ef); + return *this; +} +function_options& function_options::derivative_func(derivative_funcp_exvector d) +{ + derivative_use_exvector_args = true; + derivative_f = derivative_funcp(d); + return *this; +} +function_options& function_options::series_func(series_funcp_exvector s) +{ + series_use_exvector_args = true; + series_f = series_funcp(s); + return *this; +} + function_options & function_options::set_return_type(unsigned rt, unsigned rtt) { - use_return_type=true; - return_type=rt; - return_type_tinfo=rtt; + use_return_type = true; + return_type = rt; + return_type_tinfo = rtt; return *this; } function_options & function_options::do_not_evalf_params(void) { - evalf_params_first=false; + evalf_params_first = false; return *this; } @@ -589,23 +522,29 @@ function_options & function_options::remember(unsigned size, unsigned assoc_size, unsigned strategy) { - use_remember=true; - remember_size=size; - remember_assoc_size=assoc_size; - remember_strategy=strategy; + use_remember = true; + remember_size = size; + remember_assoc_size = assoc_size; + remember_strategy = strategy; return *this; } function_options & function_options::overloaded(unsigned o) { - functions_with_same_name=o; + functions_with_same_name = o; + return *this; +} + +function_options & function_options::set_symmetry(const symmetry & s) +{ + symtree = s; return *this; } void function_options::test_and_set_nparams(unsigned n) { if (nparams==0) { - nparams=n; + nparams = 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 @@ -616,64 +555,45 @@ void function_options::test_and_set_nparams(unsigned n) } } +/** This can be used as a hook for external applications. */ +unsigned function::current_serial = 0; + + GINAC_IMPLEMENT_REGISTERED_CLASS(function, exprseq) ////////// -// default constructor, destructor, copy constructor assignment operator and helpers +// default ctor, dtor, copy ctor, assignment operator and helpers ////////// // public function::function() : serial(0) { - debugmsg("function default constructor",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_function; } -function::~function() -{ - debugmsg("function destructor",LOGLEVEL_DESTRUCT); - destroy(false); -} - -function::function(const function & other) -{ - debugmsg("function copy constructor",LOGLEVEL_CONSTRUCT); - copy(other); -} - -const function & function::operator=(const function & other) -{ - debugmsg("function operator=",LOGLEVEL_ASSIGNMENT); - if (this != &other) { - destroy(true); - copy(other); - } - return *this; -} - // protected void function::copy(const function & other) { - exprseq::copy(other); - serial=other.serial; + inherited::copy(other); + serial = other.serial; } void function::destroy(bool call_parent) { - if (call_parent) exprseq::destroy(call_parent); + if (call_parent) + inherited::destroy(call_parent); } ////////// -// other constructors +// other ctors ////////// // public function::function(unsigned ser) : serial(ser) { - debugmsg("function constructor from unsigned",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_function; } @@ -683,21 +603,18 @@ $constructors_implementation function::function(unsigned ser, const exprseq & es) : exprseq(es), serial(ser) { - debugmsg("function constructor from unsigned,exprseq",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_function; } function::function(unsigned ser, const exvector & v, bool discardable) : exprseq(v,discardable), serial(ser) { - debugmsg("function constructor from string,exvector,bool",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_function; } function::function(unsigned ser, exvector * vp) : exprseq(vp), serial(ser) { - debugmsg("function constructor from unsigned,exvector *",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_function; } @@ -708,8 +625,6 @@ 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) { - debugmsg("function constructor from archive_node", LOGLEVEL_CONSTRUCT); - // Find serial number by function name std::string s; if (n.find_string("name", s)) { @@ -720,7 +635,7 @@ function::function(const archive_node &n, const lst &sym_lst) : inherited(n, sym serial = ser; return; } - i++; ser++; + ++i; ++ser; } throw (std::runtime_error("unknown function '" + s + "' in archive")); } else @@ -742,87 +657,62 @@ void function::archive(archive_node &n) const } ////////// -// functions overriding virtual functions from bases classes +// functions overriding virtual functions from base classes ////////// // public -basic * function::duplicate() const -{ - debugmsg("function duplicate",LOGLEVEL_DUPLICATE); - return new function(*this); -} - -void function::printraw(std::ostream & os) const +void function::print(const print_context & c, unsigned level) const { - debugmsg("function printraw",LOGLEVEL_PRINT); - GINAC_ASSERT(serialprint(os); - } - os << ")"; -} - -void function::print(std::ostream & os, unsigned upper_precedence) const -{ - debugmsg("function print",LOGLEVEL_PRINT); - - GINAC_ASSERT(serialprint(c); + ++it; + if (it != itend) + c.s << ","; + } + c.s << ")"; - // Print function name in lowercase - std::string lname; - lname=registered_functions()[serial].name; - for (unsigned i=0; ibp->printcsrc(os, type, 0); - it++; - if (it != itend) - os << ","; + } 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()); } - os << ")"; } ex function::expand(unsigned options) const { - return this->setflag(status_flags::expanded); + // Only expand arguments when asked to do so + if (options & expand_options::expand_function_args) + return inherited::expand(options); + else + return (options == 0) ? setflag(status_flags::expanded) : *this; } ex function::eval(int level) const @@ -834,17 +724,35 @@ ex function::eval(int level) const return function(serial,evalchildren(level)); } - if (registered_functions()[serial].eval_f==0) { + const function_options &opt = registered_functions()[serial]; + + // Canonicalize argument order according to the symmetry properties + if (seq.size() > 1 && !(opt.symtree.is_zero())) { + exvector v = seq; + GINAC_ASSERT(is_a(opt.symtree)); + int sig = canonicalize(v.begin(), ex_to(opt.symtree)); + if (sig != INT_MAX) { + // Something has changed while sorting arguments, more evaluations later + if (sig == 0) + return _ex0; + return ex(sig) * thisexprseq(v); + } + } + + if (opt.eval_f==0) { return this->hold(); } - bool use_remember=registered_functions()[serial].use_remember; + bool use_remember = opt.use_remember; ex eval_result; if (use_remember && lookup_remember_table(eval_result)) { return eval_result; } - - switch (registered_functions()[serial].nparams) { + current_serial = serial; + if (registered_functions()[serial].eval_use_exvector_args) + eval_result = ((eval_funcp_exvector)(registered_functions()[serial].eval_f))(seq); + else + switch (opt.nparams) { // the following lines have been generated for max. ${maxargs} parameters ${eval_switch_statement} // end of generated lines @@ -861,12 +769,31 @@ ex function::evalf(int level) const { GINAC_ASSERT(serialevalf(level)); + ++it; + } + } + + if (opt.evalf_f==0) { return function(serial,eseq).hold(); } - switch (registered_functions()[serial].nparams) { + current_serial = serial; + 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 @@ -874,6 +801,21 @@ ${evalf_switch_statement} throw(std::logic_error("function::evalf(): invalid nparams")); } +unsigned function::calchash(void) 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; + } + return v; +} + ex function::thisexprseq(const exvector & v) const { return function(serial,v); @@ -894,6 +836,15 @@ ex function::series(const relational & r, int order, unsigned options) const return basic::series(r, order); } ex res; + current_serial = serial; + if (registered_functions()[serial].series_use_exvector_args) { + try { + res = ((series_funcp_exvector)(registered_functions()[serial].series_f))(seq, r, order, options); + } catch (do_taylor) { + res = basic::series(r, order, options); + } + return res; + } switch (registered_functions()[serial].nparams) { // the following lines have been generated for max. ${maxargs} parameters ${series_switch_statement} @@ -904,36 +855,21 @@ ${series_switch_statement} // protected - /** Implementation of ex::diff() for functions. It applies the chain rule, * except for the Order term function. * \@see ex::diff */ ex function::derivative(const symbol & s) const { ex result; - + if (serial == function_index_Order) { // Order Term function only differentiates the argument return Order(seq[0].diff(s)); - } else if (serial == function_index_Derivative) { - // Inert derivative performs chain rule on the first argument only, and - // adds differentiation parameter to list (second argument) - GINAC_ASSERT(is_ex_exactly_of_type(seq[0], function)); - GINAC_ASSERT(is_ex_exactly_of_type(seq[1], function)); - ex fcn = seq[0]; - ex arg_diff; - for (unsigned i=0; i!=fcn.nops(); i++) { - arg_diff = fcn.op(i).diff(s); - if (!arg_diff.is_zero()) { - lst new_lst = ex_to_lst(seq[1]); - new_lst.append(i); - result += arg_diff * Derivative(fcn, new_lst); - } - } } else { // Chain rule ex arg_diff; - for (unsigned i=0; i!=seq.size(); i++) { + unsigned num = seq.size(); + for (unsigned i=0; i(const_cast(other)); + const function & o = static_cast(other); - if (serial!=o.serial) { + if (serial != o.serial) return serial < o.serial ? -1 : 1; - } - return exprseq::compare_same_type(o); + else + return exprseq::compare_same_type(o); } bool function::is_equal_same_type(const basic & other) const { GINAC_ASSERT(is_of_type(other, function)); - const function & o=static_cast(const_cast(other)); + const function & o = static_cast(other); - if (serial!=o.serial) return false; - return exprseq::is_equal_same_type(o); + if (serial != o.serial) + return false; + else + return exprseq::is_equal_same_type(o); +} + +bool function::match_same_type(const basic & other) const +{ + GINAC_ASSERT(is_of_type(other, function)); + const function & o = static_cast(other); + + return serial == o.serial; } unsigned function::return_type(void) const { - if (seq.size()==0) { - return return_types::commutative; + const function_options &opt = registered_functions()[serial]; + + if (opt.use_return_type) { + // Return type was explicitly specified + return opt.return_type; + } else { + // Default behavior is to use the return type of the first + // argument. Thus, exp() of a matrix behaves like a matrix, etc. + if (seq.empty()) + return return_types::commutative; + else + return seq.begin()->return_type(); } - return (*seq.begin()).return_type(); } - + unsigned function::return_type_tinfo(void) const { - if (seq.size()==0) { - return tinfo_key; + const function_options &opt = registered_functions()[serial]; + + if (opt.use_return_type) { + // Return type was explicitly specified + return opt.return_type_tinfo; + } else { + // Default behavior is to use the return type of the first + // argument. Thus, exp() of a matrix behaves like a matrix, etc. + if (seq.empty()) + return tinfo_key; + else + return seq.begin()->return_type_tinfo(); } - return (*seq.begin()).return_type_tinfo(); } ////////// @@ -999,14 +963,18 @@ ex function::pderivative(unsigned diff_param) const // partial differentiation { GINAC_ASSERT(serial=opt.functions_with_same_name) { @@ -1041,14 +1009,14 @@ unsigned function::register_new(function_options const & opt) // usually executed before main(), so the exception could not // caught anyhow std::cerr << "WARNING: function name " << opt.name - << " already in use!" << std::endl; + << " already in use!" << std::endl; } registered_functions().push_back(opt); if (opt.use_remember) { remember_table::remember_tables(). push_back(remember_table(opt.remember_size, - opt.remember_assoc_size, - opt.remember_strategy)); + opt.remember_assoc_size, + opt.remember_strategy)); } else { remember_table::remember_tables().push_back(remember_table()); } @@ -1064,28 +1032,20 @@ unsigned function::find_function(const std::string &name, unsigned nparams) while (i != end) { if (i->get_name() == name && i->get_nparams() == nparams) return serial; - i++; - serial++; + ++i; + ++serial; } throw (std::runtime_error("no function '" + name + "' with " + ToString(nparams) + " parameters defined")); } -////////// -// static member variables -////////// - -// none - -////////// -// global constants -////////// - -const function some_function; -const std::type_info & typeid_function=typeid(some_function); +/** Return the print name of the function. */ +std::string function::get_name(void) const +{ + GINAC_ASSERT(serial