X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Ffunction.pl;h=4d19e6295897a3ed19b7d70e103d39de13e9fe7a;hb=5ef801553eb39aed7bd2df9dd1aff9d752c3ea9d;hp=565b0f91c4b9f98ac58874a19a3b659393689dfd;hpb=b11c30cf00d90113c924e4a96e8fed0341c246c6;p=ginac.git diff --git a/ginac/function.pl b/ginac/function.pl index 565b0f91..4d19e629 100755 --- a/ginac/function.pl +++ b/ginac/function.pl @@ -15,94 +15,95 @@ 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 = generate_from_to( - <<'END_OF_DECLARE_FUNCTION_MACRO','const GiNaC::ex & p${N}','p${N}',1,$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 const GiNaC::function NAME(${SEQ1}) { \\ - return GiNaC::function(function_index_##NAME, ${SEQ2}); \\ +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 $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}); 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); @@ -113,7 +114,7 @@ $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}); @@ -123,7 +124,7 @@ function_options & function_options::eval_func(eval_funcp_${N} e) 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}); @@ -133,7 +134,7 @@ function_options & function_options::evalf_func(evalf_funcp_${N} ef) 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}); @@ -143,7 +144,7 @@ function_options & function_options::derivative_func(derivative_funcp_${N} d) 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}); @@ -155,14 +156,14 @@ END_OF_SERIES_FUNC_IMPLEMENTATION $interface=<(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; @@ -234,14 +216,23 @@ $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); + void initialize(); 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 @@ -250,16 +241,21 @@ $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 & 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; } + bool has_derivative() const { return derivative_f != NULL; } protected: std::string name; @@ -283,11 +279,22 @@ 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; }; + +/** 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 @@ -296,17 +303,16 @@ 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; // friend class remember_table_list; // friend class remember_table; - friend ex Derivative_eval(const ex &, const ex &); // member functions - // other ctors + // other constructors public: function(unsigned ser); // the following lines have been generated for max. ${maxargs} parameters @@ -316,26 +322,23 @@ $constructors_interface 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; + 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(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; + unsigned return_type() const; + unsigned return_type_tinfo() const; // new virtual functions which can be overridden by derived classes // none @@ -343,15 +346,16 @@ 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 protected: @@ -359,12 +363,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) @@ -372,8 +370,15 @@ template<> inline bool is_exactly_a(const basic & obj) return obj.tinfo()==TINFO_function; } -#define is_ex_the_function(OBJ, FUNCNAME) \\ - (is_ex_exactly_of_type(OBJ, function) && static_cast(OBJ.bp)->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 @@ -384,14 +389,14 @@ END_OF_INTERFACE $implementation=< #include #include #include #include "function.h" +#include "operators.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 { @@ -445,13 +453,17 @@ 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; 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; @@ -460,7 +472,7 @@ void function_options::initialize(void) function_options & function_options::set_name(std::string const & n, std::string const & tn) { - name=n; + name = n; if (tn==std::string()) TeX_name = "\\\\mbox{"+name+"}"; else @@ -470,7 +482,7 @@ function_options & function_options::set_name(std::string const & n, function_options & function_options::latex_name(std::string const & tn) { - TeX_name=tn; + TeX_name = tn; return *this; } @@ -481,6 +493,31 @@ $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; @@ -489,7 +526,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; @@ -526,49 +563,37 @@ void function_options::test_and_set_nparams(unsigned 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 (" + std::cerr << "WARNING: " << name << "(): number of parameters (" << n << ") differs from number set before (" << nparams << ")" << std::endl; } } +/** 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 constructor ////////// // public function::function() : serial(0) { - debugmsg("function default ctor",LOGLEVEL_CONSTRUCT); 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 function::function(unsigned ser) : serial(ser) { - debugmsg("function ctor from unsigned",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_function; } @@ -578,21 +603,22 @@ $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; + + // 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) : 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; } @@ -601,10 +627,8 @@ 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) { - debugmsg("function ctor from archive_node", LOGLEVEL_CONSTRUCT); - // Find serial number by function name std::string s; if (n.find_string("name", s)) { @@ -623,7 +647,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); } @@ -637,18 +661,16 @@ 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(serial(c)) { c.s << std::string(level, ' ') << class_name() << " " << registered_functions()[serial].name @@ -656,16 +678,16 @@ void function::print(const print_context & c, unsigned level) const << ", nops=" << nops() << std::endl; unsigned delta_indent = static_cast(c).delta_indent; - for (unsigned i=0; i(c)) { // Print function name in lowercase std::string lname = registered_functions()[serial].name; - unsigned num = lname.size(); - for (unsigned i=0; i(c)) { c.s << registered_functions()[serial].TeX_name; printseq(c, '(', ',', ')', exprseq::precedence(), function::precedence()); } else { @@ -697,24 +719,6 @@ ex function::expand(unsigned options) const return (options == 0) ? setflag(status_flags::expanded) : *this; } -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(); - else - return n==0 ? ex(*this) : _ex0(); -} - ex function::eval(int level) const { GINAC_ASSERT(serial 1 && !(opt.symtree.is_zero())) { exvector v = seq; - GINAC_ASSERT(is_ex_exactly_of_type(opt.symtree, symmetry)); + 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); + return _ex0; + return ex(sig) * thiscontainer(v); } } @@ -748,7 +752,10 @@ ex function::eval(int level) const 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} @@ -766,25 +773,31 @@ ex function::evalf(int level) const { 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(); } - 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 @@ -792,14 +805,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; @@ -807,12 +820,12 @@ 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); } -ex function::thisexprseq(exvector * vp) const +ex function::thiscontainer(exvector * vp) const { return function(serial,vp); } @@ -827,6 +840,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} @@ -843,30 +865,15 @@ ${series_switch_statement} ex function::derivative(const symbol & s) const { ex result; - - if (serial == function_index_Order) { + + if (serial == Order_SERIAL::serial) { // 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(seq[1]); - new_lst.append(i); - result += arg_diff * Derivative(fcn, new_lst); - } - } } else { // Chain rule ex arg_diff; - unsigned num = seq.size(); - for (unsigned i=0; i(other)); const function & o = static_cast(other); if (serial != o.serial) @@ -893,7 +900,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) @@ -904,26 +911,44 @@ 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(); + 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(); + } } -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(); + 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(); + } } ////////// @@ -942,9 +967,13 @@ 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; @@ -973,8 +1002,8 @@ void function::store_remember_table(ex const & result) const unsigned function::register_new(function_options const & opt) { - unsigned same_name = 0; - for (unsigned i=0; i