X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Ffunction.pl;h=760252748775130c3db0331776c131e1a0cef96c;hp=cfb9e813d9622289332ac45d71efa7c012f2e0bb;hb=82fd1a4ad2f5d58a502a2ccc71be45093b282fea;hpb=0cf43f3096cbcfc7472ff9c8927c6eb74f2eeb8c diff --git a/ginac/function.pl b/ginac/function.pl index cfb9e813..76025274 100755 --- a/ginac/function.pl +++ b/ginac/function.pl @@ -15,108 +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 = <<'END_OF_DECLARE_FUNCTION_1_AND_2P_MACRO'; -#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 - -$declare_function_macro .= generate_from_to( - <<'END_OF_DECLARE_FUNCTION_MACRO','const GiNaC::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 GiNaC::function NAME(${SEQ1}) { \\ - return GiNaC::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 $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 ctor 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); @@ -127,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" @@ -212,33 +200,6 @@ $declare_function_macro 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)); - -#define BEGIN_TYPECHECK \\ -bool automatic_typecheck=true; - -#define TYPECHECK(VAR,TYPE) \\ -if (!is_exactly_a(VAR)) { \\ - automatic_typecheck=false; \\ -} else - -#define TYPECHECK_INTEGER(VAR) \\ -if (!(VAR).info(GiNaC::info_flags::integer)) { \\ - automatic_typecheck=false; \\ -} else - -#define END_TYPECHECK(RV) \\ -{} \\ -if (!automatic_typecheck) { \\ - return RV.hold(); \\ -} - namespace GiNaC { class function; @@ -256,9 +217,17 @@ $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()); @@ -272,6 +241,11 @@ $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, @@ -281,6 +255,7 @@ $series_func_interface 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; @@ -304,6 +279,11 @@ 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; @@ -333,27 +313,24 @@ public: $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: void print(const print_context & c, unsigned level = 0) const; unsigned precedence(void) const {return 70;} - int degree(const ex & s) const; - int ldegree(const ex & s) const; - ex coeff(const ex & s, int n = 1) const; 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; - bool match(const ex & pattern, lst & repl_lst) const; ex thisexprseq(const exvector & v) const; ex thisexprseq(exvector * 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; @@ -368,10 +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 get_serial(void) const {return serial;} std::string get_name(void) const; - + // member variables protected: @@ -379,12 +357,6 @@ protected: }; // utility functions/macros -/** Return the object of type function handled by an ex. - * This is unsafe: you need to check the type first. */ -inline const function &ex_to_function(const ex &e) -{ - return static_cast(*e.bp); -} /** Specialization of is_exactly_a(obj) for objects of type function. */ template<> inline bool is_exactly_a(const basic & obj) @@ -393,7 +365,7 @@ template<> inline bool is_exactly_a(const basic & obj) } #define is_ex_the_function(OBJ, FUNCNAME) \\ - (is_ex_exactly_of_type(OBJ, function) && static_cast(OBJ.bp)->get_serial() == function_index_##FUNCNAME) + (GiNaC::is_exactly_a(OBJ) && GiNaC::ex_to(OBJ).get_serial() == function_index_##FUNCNAME) } // namespace GiNaC @@ -404,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" namespace GiNaC { @@ -468,30 +442,33 @@ function_options::~function_options() void function_options::initialize(void) { 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; - use_remember=false; - functions_with_same_name=1; + 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="\\\\mbox{"+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; + TeX_name = tn; return *this; } @@ -502,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; } @@ -520,16 +522,16 @@ 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; } @@ -542,7 +544,7 @@ function_options & function_options::set_symmetry(const symmetry & s) 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 @@ -553,17 +555,20 @@ 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 ctor, dtor, copy ctor assignment operator and helpers +// default ctor, dtor, copy ctor, assignment operator and helpers ////////// // public function::function() : serial(0) { - debugmsg("function default ctor",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_function; } @@ -571,13 +576,14 @@ function::function() : serial(0) 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); } ////////// @@ -588,7 +594,6 @@ void function::destroy(bool call_parent) function::function(unsigned ser) : serial(ser) { - debugmsg("function ctor from unsigned",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_function; } @@ -598,21 +603,18 @@ $constructors_implementation function::function(unsigned ser, const exprseq & es) : exprseq(es), serial(ser) { - debugmsg("function ctor 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 ctor from string,exvector,bool",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_function; } function::function(unsigned ser, exvector * vp) : exprseq(vp), serial(ser) { - debugmsg("function ctor from unsigned,exvector *",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_function; } @@ -623,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 ctor from archive_node", LOGLEVEL_CONSTRUCT); - // Find serial number by function name std::string s; if (n.find_string("name", s)) { @@ -635,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 @@ -657,15 +657,13 @@ void function::archive(archive_node &n) const } ////////// -// functions overriding virtual functions from bases classes +// functions overriding virtual functions from base classes ////////// // public void function::print(const print_context & c, unsigned level) const { - debugmsg("function print", LOGLEVEL_PRINT); - GINAC_ASSERT(serialprint(c); - it++; + ++it; if (it != itend) c.s << ","; } @@ -709,25 +708,11 @@ void function::print(const print_context & c, unsigned level) const ex function::expand(unsigned options) const { - return this->setflag(status_flags::expanded); -} - -int function::degree(const ex & s) const -{ - return is_equal(*s.bp) ? 1 : 0; -} - -int function::ldegree(const ex & s) const -{ - return is_equal(*s.bp) ? 1 : 0; -} - -ex function::coeff(const ex & s, int n) const -{ - if (is_equal(*s.bp)) - return n==1 ? _ex1() : _ex0(); + // Only expand arguments when asked to do so + if (options & expand_options::expand_function_args) + return inherited::expand(options); else - return n==0 ? ex(*this) : _ex0(); + return (options == 0) ? setflag(status_flags::expanded) : *this; } ex function::eval(int level) const @@ -744,12 +729,12 @@ ex function::eval(int level) const // Canonicalize argument order according to the symmetry properties if (seq.size() > 1 && !(opt.symtree.is_zero())) { exvector v = seq; - GINAC_ASSERT(is_ex_exactly_of_type(opt.symtree, symmetry)); - int sig = canonicalize(v.begin(), ex_to_symmetry(opt.symtree)); + 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 _ex0; return ex(sig) * thisexprseq(v); } } @@ -758,12 +743,15 @@ ex function::eval(int level) const return this->hold(); } - bool use_remember=opt.use_remember; + bool use_remember = opt.use_remember; ex eval_result; if (use_remember && lookup_remember_table(eval_result)) { return eval_result; } - + 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} @@ -781,11 +769,27 @@ ex function::evalf(int level) const { GINAC_ASSERT(serialevalf(level)); + ++it; + } if (registered_functions()[serial].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) { // the following lines have been generated for max. ${maxargs} parameters ${evalf_switch_statement} @@ -829,6 +833,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} @@ -837,46 +850,23 @@ ${series_switch_statement} throw(std::logic_error("function::series(): invalid nparams")); } -bool function::match(const ex & pattern, lst & repl_lst) const -{ - // Serial number must match - if (is_ex_of_type(pattern, function) && serial != ex_to_function(pattern).serial) - return false; - return inherited::match(pattern, repl_lst); -} - // 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; + 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); - if (serial!=o.serial) return false; - return exprseq::is_equal_same_type(o); + 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(); } ////////// @@ -942,14 +960,18 @@ ex function::pderivative(unsigned diff_param) const // partial differentiation { GINAC_ASSERT(serial=opt.functions_with_same_name) { @@ -984,14 +1006,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()); } @@ -1007,8 +1029,8 @@ 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")); }