X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Ffunction.pl;h=d97e58f674e916b0b81109afdbd7dae20b732008;hp=988206e9265ebfb231c607b1d75eb3bd4a321525;hb=383d5eb3b0f0506810d9105a268f939125bfc347;hpb=2db113296f65f8fd3a0d62781ddc9276ff07b487 diff --git a/ginac/function.pl b/ginac/function.pl index 988206e9..d97e58f6 100755 --- a/ginac/function.pl +++ b/ginac/function.pl @@ -1,143 +1,83 @@ -#!/usr/bin/perl -w - $maxargs=13; sub generate_seq { - my ($seq_template,$n)=@_; - my ($res,$N); - - $res=''; - for ($N=1; $N<=$n; $N++) { - $res .= eval('"' . $seq_template . '"'); - if ($N!=$n) { - $res .= ', '; - } - } - return $res; + my ($seq_template,$n)=@_; + my ($res,$N); + + $res=''; + for ($N=1; $N<=$n; $N++) { + $res .= eval('"' . $seq_template . '"'); + if ($N!=$n) { + $res .= ', '; + } + } + return $res; } sub generate_from_to { - my ($template,$seq_template1,$seq_template2,$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); - $res .= eval('"' . $template . '"'); - $SEQ1=''; # to avoid main::SEQ1 used only once warning - $SEQ2=''; # same as above - } - return $res; + my ($template,$seq_template1,$seq_template2,$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); + $res .= eval('"' . $template . '"'); + $SEQ1=''; # to avoid main::SEQ1 used only once warning + $SEQ2=''; # 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)=@_; + return generate_from_to($template,$seq_template1,$seq_template2,1,$maxargs); } $declare_function_macro_namespace = <<'END_OF_DECLARE_FUNCTION_1_AND_2P_MACRO_NAMESPACE'; -#ifdef CINT_CONVERSION_WORKAROUND - -#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); \ -} \ -inline GiNaC::function NAME(const GiNaC::basic & p1) { \ - return GiNaC::function(function_index_##NAME, GiNaC::ex(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); \ -} \ -inline GiNaC::function NAME(const GiNaC::basic & p1, const GiNaC::ex & p2) { \ - return GiNaC::function(function_index_##NAME, GiNaC::ex(p1), p2); \ -} \ -inline GiNaC::function NAME(const GiNaC::ex & p1, const GiNaC::basic & p2) { \ - return GiNaC::function(function_index_##NAME, p1, GiNaC::ex(p2)); \ -} \ -inline GiNaC::function NAME(const GiNaC::basic & p1, const GiNaC::basic & p2) { \ - return GiNaC::function(function_index_##NAME, GiNaC::ex(p1), GiNaC::ex(p2)); \ -} - -#else // def CINT_CONVERSION_WORKAROUND - #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); \ + 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); \ + return GiNaC::function(function_index_##NAME, p1, p2); \ } -#endif // def CINT_CONVERSION_WORKAROUND - 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); + <<'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}); \\ + 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'; -#ifdef CINT_CONVERSION_WORKAROUND - #define DECLARE_FUNCTION_1P(NAME) \ extern const unsigned function_index_##NAME; \ inline function NAME(const ex & p1) { \ - return function(function_index_##NAME, p1); \ -} \ -inline function NAME(const basic & p1) { \ - return function(function_index_##NAME, 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); \ -} \ -inline function NAME(const basic & p1, const ex & p2) { \ - return function(function_index_##NAME, ex(p1), p2); \ -} \ -inline function NAME(const ex & p1, const basic & p2) { \ - return function(function_index_##NAME, p1, ex(p2)); \ -} \ -inline function NAME(const basic & p1, const basic & p2) { \ - return function(function_index_##NAME, ex(p1), ex(p2)); \ + return function(function_index_##NAME, p1, p2); \ } -#else // def CINT_CONVERSION_WORKAROUND - -#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); \ -} - -#endif // def CINT_CONVERSION_WORKAROUND - 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); + <<'END_OF_DECLARE_FUNCTION_MACRO_NO_NAMESPACE','const ex & p${N}','p${N}',3,$maxargs); #define DECLARE_FUNCTION_${N}P(NAME) \\ extern const unsigned function_index_##NAME; \\ inline function NAME(${SEQ1}) { \\ - return function(function_index_##NAME, ${SEQ2}); \\ + return function(function_index_##NAME, ${SEQ2}); \\ } END_OF_DECLARE_FUNCTION_MACRO_NO_NAMESPACE @@ -155,7 +95,7 @@ $typedef_derivative_funcp=generate( 'const ex &',''); $typedef_series_funcp=generate( -'typedef ex (* series_funcp_${N})(${SEQ1}, const symbol &, const ex &, int);'."\n", +'typedef ex (* series_funcp_${N})(${SEQ1}, const relational &, int, unsigned);'."\n", 'const ex &',''); $eval_func_interface=generate(' function_options & eval_func(eval_funcp_${N} e);'."\n",'',''); @@ -171,85 +111,82 @@ $constructors_interface=generate( '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) + : exprseq(${SEQ2}), serial(ser) { - debugmsg(\"function constructor from unsigned,${N}*ex\",LOGLEVEL_CONSTRUCT); - tinfo_key = TINFO_function; + 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]',''); - case ${N}: - eval_result=((eval_funcp_${N})(registered_functions()[serial].eval_f))(${SEQ1}); - break; + <<'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]',''); - case ${N}: - return ((evalf_funcp_${N})(registered_functions()[serial].evalf_f))(${SEQ1}); - break; + <<'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]',''); - case ${N}: - return ((derivative_funcp_${N})(registered_functions()[serial].derivative_f))(${SEQ1},diff_param); - break; + <<'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]',''); - case ${N}: - try { - res = ((series_funcp_${N})(registered_functions()[serial].series_f))(${SEQ1},s,point,order); - } catch (do_taylor) { - res = basic::series(s, point, order); - } - return res; - break; + <<'END_OF_SERIES_SWITCH_STATEMENT','seq[${N}-1]',''); + case ${N}: + try { + res = ((series_funcp_${N})(registered_functions()[serial].series_f))(${SEQ1},r,order,options); + } catch (do_taylor) { + res = basic::series(r, order, options); + } + return res; 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); - return *this; + test_and_set_nparams(${N}); + 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); - return *this; + test_and_set_nparams(${N}); + 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); - return *this; + test_and_set_nparams(${N}); + 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); - return *this; + test_and_set_nparams(${N}); + series_f=series_funcp(s); + return *this; } END_OF_SERIES_FUNC_IMPLEMENTATION @@ -263,7 +200,7 @@ $interface=< #include -#ifdef __CINT__ // CINT needs to work properly with #include -#endif // def __CINT__ #include "exprseq.h" @@ -311,29 +246,29 @@ $declare_function_macro_no_namespace #define REGISTER_FUNCTION(NAME,OPT) \\ const unsigned function_index_##NAME= \\ - GiNaC::function::register_new(GiNaC::function_options(#NAME).OPT); + 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)); + 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); + 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)); + function::register_new(function_options(#NAME). \\ + eval_func(E). \\ + evalf_func(EF). \\ + derivative_func(D). \\ + series_func(S)); #endif // ndef NO_NAMESPACE_GINAC @@ -342,21 +277,21 @@ bool automatic_typecheck=true; #define TYPECHECK(VAR,TYPE) \\ if (!is_ex_exactly_of_type(VAR,TYPE)) { \\ - automatic_typecheck=false; \\ + automatic_typecheck=false; \\ } else #ifndef NO_NAMESPACE_GINAC #define TYPECHECK_INTEGER(VAR) \\ if (!(VAR).info(GiNaC::info_flags::integer)) { \\ - automatic_typecheck=false; \\ + automatic_typecheck=false; \\ } else #else // ndef NO_NAMESPACE_GINAC #define TYPECHECK_INTEGER(VAR) \\ if (!(VAR).info(info_flags::integer)) { \\ - automatic_typecheck=false; \\ + automatic_typecheck=false; \\ } else #endif // ndef NO_NAMESPACE_GINAC @@ -364,7 +299,7 @@ if (!(VAR).info(info_flags::integer)) { \\ #define END_TYPECHECK(RV) \\ {} \\ if (!automatic_typecheck) { \\ - return RV.hold(); \\ + return RV.hold(); \\ } #ifndef NO_NAMESPACE_GINAC @@ -387,149 +322,152 @@ $typedef_series_funcp class function_options { - friend class function; + friend class function; public: - function_options(); - function_options(string const & n, string const & tn=string()); - ~function_options(); - void initialize(void); - function_options & set_name(string const & n, string const & tn=string()); + 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()); // 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 & 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); - void test_and_set_nparams(unsigned n); - string get_name(void) const { return name; } - unsigned get_nparams(void) const { return nparams; } + 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); + void test_and_set_nparams(unsigned n); + std::string get_name(void) const { return name; } + unsigned get_nparams(void) const { return nparams; } protected: - string name; - string TeX_name; + std::string name; + std::string TeX_name; - unsigned nparams; + unsigned nparams; - eval_funcp eval_f; - evalf_funcp evalf_f; - derivative_funcp derivative_f; - series_funcp series_f; + eval_funcp eval_f; + evalf_funcp evalf_f; + derivative_funcp derivative_f; + series_funcp series_f; - bool evalf_params_first; + bool evalf_params_first; - bool use_return_type; - unsigned return_type; - unsigned return_type_tinfo; + bool use_return_type; + unsigned return_type; + unsigned return_type_tinfo; - bool use_remember; - unsigned remember_size; - unsigned remember_assoc_size; - unsigned remember_strategy; + bool use_remember; + unsigned remember_size; + unsigned remember_assoc_size; + unsigned remember_strategy; - unsigned functions_with_same_name; + unsigned functions_with_same_name; }; /** The class function is used to implement builtin functions like sin, cos... - and user defined functions */ + and user defined functions */ class function : public exprseq { - GINAC_DECLARE_REGISTERED_CLASS(function, exprseq) + GINAC_DECLARE_REGISTERED_CLASS(function, exprseq) - // CINT has a linking problem - friend void ginsh_get_ginac_functions(void); + // CINT has a linking problem +#ifndef __MAKECINT__ + friend void ginsh_get_ginac_functions(void); +#endif // def __MAKECINT__ - friend class remember_table_entry; - // friend class remember_table_list; - // friend class remember_table; + friend class remember_table_entry; + // friend class remember_table_list; + // friend class remember_table; // member functions - // default constructor, destructor, copy constructor assignment operator and helpers + // default constructor, destructor, copy constructor assignment operator and helpers public: - function(); - ~function(); - function(const function & other); - const function & operator=(const function & other); + function(); + ~function(); + function(const function & other); + const function & operator=(const function & other); protected: - void copy(const function & other); - void destroy(bool call_parent); + void copy(const function & other); + void destroy(bool call_parent); - // other constructors + // other constructors public: - function(unsigned ser); - // the following lines have been generated for max. ${maxargs} parameters + 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, exvector * vp); // vp will be deleted + // end of generated lines + function(unsigned ser, const exprseq & es); + function(unsigned ser, const exvector & v, bool discardable=0); + function(unsigned ser, exvector * vp); // vp will be deleted - // functions overriding virtual functions from bases classes + // functions overriding virtual functions from bases classes public: - basic * duplicate() const; - void printraw(ostream & os) const; - void print(ostream & os, unsigned upper_precedence=0) const; - void printtree(ostream & os, unsigned indent) const; - void printcsrc(ostream & os, unsigned type, unsigned upper_precedence=0) const; - ex expand(unsigned options=0) const; - ex eval(int level=0) const; - ex evalf(int level=0) const; - ex series(const symbol & s, const ex & point, int order) const; - ex thisexprseq(const exvector & v) const; - ex thisexprseq(exvector * vp) const; + 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; + ex expand(unsigned options=0) const; + ex eval(int level=0) const; + ex evalf(int level=0) 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; - unsigned return_type(void) const; - unsigned return_type_tinfo(void) const; - - // new virtual functions which can be overridden by derived classes - // none - - // non-virtual functions in this class + ex derivative(const symbol & s) const; + int compare_same_type(const basic & other) const; + bool is_equal_same_type(const basic & other) const; + unsigned return_type(void) const; + unsigned return_type_tinfo(void) const; + + // new virtual functions which can be overridden by derived classes + // none + + // non-virtual functions in this class protected: - ex pderivative(unsigned diff_param) const; // partial differentiation - static vector & registered_functions(void); - bool lookup_remember_table(ex & result) const; - void store_remember_table(ex const & result) const; + ex pderivative(unsigned diff_param) const; // partial differentiation + static std::vector & registered_functions(void); + bool lookup_remember_table(ex & result) const; + void store_remember_table(ex const & result) const; public: - static unsigned register_new(function_options const & opt); - unsigned getserial(void) const {return serial;} - + static unsigned register_new(function_options const & opt); + static unsigned find_function(const std::string &name, unsigned nparams); + unsigned getserial(void) const {return serial;} + // member variables protected: - unsigned serial; + unsigned serial; }; // utility functions/macros inline const function &ex_to_function(const ex &e) { - return static_cast(*e.bp); + return static_cast(*e.bp); } #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) + (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) + (is_ex_exactly_of_type(OBJ, function) && static_cast(OBJ.bp)->getserial() == function_index_##FUNCNAME) #endif // ndef NO_NAMESPACE_GINAC // global constants extern const function some_function; -extern const type_info & typeid_function; +extern const std::type_info & typeid_function; #ifndef NO_NAMESPACE_GINAC } // namespace GiNaC @@ -549,7 +487,7 @@ $implementation=<::const_iterator i = registered_functions().begin(), iend = registered_functions().end(); - while (i != iend) { - if (s == i->name) { - serial = ser; - return; - } - i++; ser++; - } - throw (std::runtime_error("unknown function '" + s + "' in archive")); - } else - throw (std::runtime_error("unnamed function in archive")); + debugmsg("function constructor from archive_node", LOGLEVEL_CONSTRUCT); + + // Find serial number by function name + std::string s; + if (n.find_string("name", s)) { + unsigned int ser = 0; + std::vector::const_iterator i = registered_functions().begin(), iend = registered_functions().end(); + while (i != iend) { + if (s == i->name) { + serial = ser; + return; + } + i++; ser++; + } + throw (std::runtime_error("unknown function '" + s + "' in archive")); + } else + throw (std::runtime_error("unnamed function in archive")); } /** Unarchive the object. */ ex function::unarchive(const archive_node &n, const lst &sym_lst) { - return (new function(n, sym_lst))->setflag(status_flags::dynallocated); + return (new function(n, sym_lst))->setflag(status_flags::dynallocated); } /** Archive the object. */ void function::archive(archive_node &n) const { - inherited::archive(n); - GINAC_ASSERT(serial < registered_functions().size()); - n.add_string("name", registered_functions()[serial].name); + inherited::archive(n); + GINAC_ASSERT(serial < registered_functions().size()); + n.add_string("name", registered_functions()[serial].name); } ////////// @@ -810,156 +749,157 @@ void function::archive(archive_node &n) const basic * function::duplicate() const { - debugmsg("function duplicate",LOGLEVEL_DUPLICATE); - return new function(*this); + debugmsg("function duplicate",LOGLEVEL_DUPLICATE); + return new function(*this); } -void function::printraw(ostream & os) const +void function::printraw(std::ostream & os) const { - debugmsg("function printraw",LOGLEVEL_PRINT); + debugmsg("function printraw",LOGLEVEL_PRINT); - GINAC_ASSERT(serialprint(os); - } - os << ")"; + os << "function(name=" << registered_functions()[serial].name; + for (exvector::const_iterator it=seq.begin(); it!=seq.end(); ++it) { + os << ","; + (*it).bp->print(os); + } + os << ")"; } -void function::print(ostream & os, unsigned upper_precedence) const +void function::print(std::ostream & os, unsigned upper_precedence) const { - debugmsg("function print",LOGLEVEL_PRINT); + debugmsg("function print",LOGLEVEL_PRINT); - GINAC_ASSERT(serialbp->printcsrc(os, type, 0); - it++; - if (it != itend) - os << ","; - } - os << ")"; + exvector::const_iterator it = seq.begin(); + exvector::const_iterator itend = seq.end(); + while (it != itend) { + it->bp->printcsrc(os, type, 0); + it++; + if (it != itend) + os << ","; + } + os << ")"; } ex function::expand(unsigned options) const { - return this->setflag(status_flags::expanded); + return this->setflag(status_flags::expanded); } ex function::eval(int level) const { - GINAC_ASSERT(serial1) { - // first evaluate children, then we will end up here again - return function(serial,evalchildren(level)); - } + if (level>1) { + // first evaluate children, then we will end up here again + return function(serial,evalchildren(level)); + } - if (registered_functions()[serial].eval_f==0) { - return this->hold(); - } + if (registered_functions()[serial].eval_f==0) { + return this->hold(); + } - bool use_remember=registered_functions()[serial].use_remember; - ex eval_result; - if (use_remember && lookup_remember_table(eval_result)) { - return eval_result; - } + bool use_remember=registered_functions()[serial].use_remember; + ex eval_result; + if (use_remember && lookup_remember_table(eval_result)) { + return eval_result; + } - switch (registered_functions()[serial].nparams) { - // the following lines have been generated for max. ${maxargs} parameters + switch (registered_functions()[serial].nparams) { + // the following lines have been generated for max. ${maxargs} parameters ${eval_switch_statement} - // end of generated lines - default: - throw(std::logic_error("function::eval(): invalid nparams")); - } - if (use_remember) { - store_remember_table(eval_result); - } - return eval_result; + // end of generated lines + default: + throw(std::logic_error("function::eval(): invalid nparams")); + } + if (use_remember) { + store_remember_table(eval_result); + } + return eval_result; } ex function::evalf(int level) const { - GINAC_ASSERT(serial(const_cast(other)); + GINAC_ASSERT(is_of_type(other, function)); + const function & o=static_cast(const_cast(other)); - if (serial!=o.serial) { - return serial < o.serial ? -1 : 1; - } - return exprseq::compare_same_type(o); + if (serial!=o.serial) { + return serial < o.serial ? -1 : 1; + } + 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)); + GINAC_ASSERT(is_of_type(other, function)); + const function & o=static_cast(const_cast(other)); - if (serial!=o.serial) return false; - return exprseq::is_equal_same_type(o); + if (serial!=o.serial) return false; + return exprseq::is_equal_same_type(o); } unsigned function::return_type(void) const { - if (seq.size()==0) { - return return_types::commutative; - } - return (*seq.begin()).return_type(); + if (seq.size()==0) { + return return_types::commutative; + } + return (*seq.begin()).return_type(); } unsigned function::return_type_tinfo(void) const { - if (seq.size()==0) { - return tinfo_key; - } - return (*seq.begin()).return_type_tinfo(); + if (seq.size()==0) { + return tinfo_key; + } + return (*seq.begin()).return_type_tinfo(); } ////////// @@ -1042,62 +997,77 @@ 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(void) { - static vector * rf=new vector; - return *rf; + static std::vector * rf = new std::vector; + return *rf; } bool function::lookup_remember_table(ex & result) const { - return remember_table::remember_tables()[serial].lookup_entry(*this,result); + return remember_table::remember_tables()[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()[serial].add_entry(*this,result); } // public unsigned function::register_new(function_options const & opt) { - unsigned same_name=0; - for (unsigned i=0; i=opt.functions_with_same_name) { - // we do not throw an exception here because this code is - // usually executed before main(), so the exception could not - // caught anyhow - cerr << "WARNING: function name " << opt.name - << " already in use!" << 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)); - } else { - remember_table::remember_tables().push_back(remember_table()); - } - return registered_functions().size()-1; + unsigned same_name=0; + for (unsigned i=0; i=opt.functions_with_same_name) { + // 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: function name " << opt.name + << " 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)); + } else { + remember_table::remember_tables().push_back(remember_table()); + } + return registered_functions().size()-1; +} + +/** Find serial number of function by name and number of parameters. + * Throws exception if function was not found. */ +unsigned function::find_function(const std::string &name, unsigned nparams) +{ + std::vector::const_iterator i = function::registered_functions().begin(), end = function::registered_functions().end(); + unsigned serial = 0; + while (i != end) { + if (i->get_name() == name && i->get_nparams() == nparams) + return serial; + i++; + serial++; + } + throw (std::runtime_error("no function '" + name + "' with " + ToString(nparams) + " parameters defined")); } ////////// @@ -1111,7 +1081,7 @@ unsigned function::register_new(function_options const & opt) ////////// const function some_function; -const type_info & typeid_function=typeid(some_function); +const std::type_info & typeid_function=typeid(some_function); #ifndef NO_NAMESPACE_GINAC } // namespace GiNaC