X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Ffunction.pl;h=a866b7e35f557a8deb06da4b39cf47dd9fc3274b;hp=4f8e35378fb4e3031d88ec3972c2a213fd933435;hb=e22d2ed95925d870876c4fcd922ea2a9cfdbdab1;hpb=619d77d2676f7f1a562fb9fefc0ba6754fe2d750 diff --git a/ginac/function.pl b/ginac/function.pl old mode 100755 new mode 100644 index 4f8e3537..a866b7e3 --- a/ginac/function.pl +++ b/ginac/function.pl @@ -2,7 +2,7 @@ # function.pl options: \$maxargs=${maxargs} # -# GiNaC Copyright (C) 1999-2007 Johannes Gutenberg University Mainz, Germany +# GiNaC Copyright (C) 1999-2010 Johannes Gutenberg University Mainz, Germany # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -138,7 +138,6 @@ $constructors_implementation=generate( function::function(unsigned ser, ${SEQ1}) : exprseq(${SEQ2}), serial(ser) { - tinfo_key = &function::tinfo_static; } END_OF_CONSTRUCTORS_IMPLEMENTATION @@ -293,7 +292,7 @@ $interface=< -#include +#include "exprseq.h" // CINT needs to work properly with #include - -#include "exprseq.h" +#include +#include // the following lines have been generated for max. ${maxargs} parameters $declare_function_macro @@ -410,7 +408,7 @@ $print_func_interface return *this; } - function_options & set_return_type(unsigned rt, tinfo_t rtt=NULL); + function_options & set_return_type(unsigned rt, const return_type_t* rtt = 0); function_options & do_not_evalf_params(); function_options & remember(unsigned size, unsigned assoc_size=0, unsigned strategy=remember_strategies::delete_never); @@ -445,7 +443,7 @@ protected: bool use_return_type; unsigned return_type; - tinfo_t return_type_tinfo; + return_type_t return_type_tinfo; bool use_remember; unsigned remember_size; @@ -507,6 +505,7 @@ public: ex expand(unsigned options=0) const; ex eval(int level=0) const; ex evalf(int level=0) const; + ex eval_ncmul(const exvector & v) const; unsigned calchash() const; ex series(const relational & r, int order, unsigned options = 0) const; ex thiscontainer(const exvector & v) const; @@ -514,12 +513,14 @@ public: ex conjugate() const; ex real_part() const; ex imag_part() const; + void archive(archive_node& n) const; + void read_archive(const archive_node& n, lst& syms); 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() const; - tinfo_t return_type_tinfo() const; + return_type_t return_type_tinfo() const; // new virtual functions which can be overridden by derived classes // none @@ -535,6 +536,7 @@ public: static unsigned register_new(function_options const & opt); static unsigned current_serial; static unsigned find_function(const std::string &name, unsigned nparams); + static std::vector get_registered_functions() { return registered_functions(); }; unsigned get_serial() const {return serial;} std::string get_name() const; @@ -543,6 +545,7 @@ public: protected: unsigned serial; }; +GINAC_DECLARE_UNARCHIVER(function); // utility functions/macros @@ -558,7 +561,7 @@ inline bool is_the_function(const ex & x) } // namespace GiNaC -#endif // ndef __GINAC_FUNCTION_H__ +#endif // ndef GINAC_FUNCTION_H END_OF_INTERFACE @@ -572,7 +575,7 @@ $implementation=< -#include -#include -#include - #include "function.h" #include "operators.h" #include "fderivative.h" @@ -606,8 +604,15 @@ $implementation=< +#include +#include +#include +#include + namespace GiNaC { ////////// @@ -737,11 +742,14 @@ function_options& function_options::series_func(series_funcp_exvector s) return *this; } -function_options & function_options::set_return_type(unsigned rt, tinfo_t rtt) +function_options & function_options::set_return_type(unsigned rt, const return_type_t* rtt) { use_return_type = true; return_type = rt; - return_type_tinfo = rtt; + if (rtt != 0) + return_type_tinfo = *rtt; + else + return_type_tinfo = make_return_type_t(); return *this; } @@ -809,7 +817,6 @@ GINAC_IMPLEMENT_REGISTERED_CLASS(function, exprseq) function::function() : serial(0) { - tinfo_key = &function::tinfo_static; } ////////// @@ -820,7 +827,6 @@ function::function() : serial(0) function::function(unsigned ser) : serial(ser) { - tinfo_key = &function::tinfo_static; } // the following lines have been generated for max. ${maxargs} parameters @@ -829,7 +835,6 @@ $constructors_implementation function::function(unsigned ser, const exprseq & es) : exprseq(es), serial(ser) { - tinfo_key = &function::tinfo_static; // Force re-evaluation even if the exprseq was already evaluated // (the exprseq copy constructor copies the flags) @@ -839,13 +844,11 @@ function::function(unsigned ser, const exprseq & es) : exprseq(es), serial(ser) function::function(unsigned ser, const exvector & v, bool discardable) : exprseq(v,discardable), serial(ser) { - tinfo_key = &function::tinfo_static; } function::function(unsigned ser, std::auto_ptr vp) : exprseq(vp), serial(ser) { - tinfo_key = &function::tinfo_static; } ////////// @@ -853,8 +856,9 @@ function::function(unsigned ser, std::auto_ptr vp) ////////// /** Construct object from archive_node. */ -function::function(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) +void function::read_archive(const archive_node& n, lst& sym_lst) { + inherited::read_archive(n, sym_lst); // Find serial number by function name std::string s; if (n.find_string("name", s)) { @@ -872,12 +876,6 @@ function::function(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) throw (std::runtime_error("unnamed function in archive")); } -/** Unarchive the object. */ -ex function::unarchive(const archive_node &n, lst &sym_lst) -{ - return (new function(n, sym_lst))->setflag(status_flags::dynallocated); -} - /** Archive the object. */ void function::archive(archive_node &n) const { @@ -886,6 +884,8 @@ void function::archive(archive_node &n) const n.add_string("name", registered_functions()[serial].name); } +GINAC_BIND_UNARCHIVER(function); + ////////// // functions overriding virtual functions from base classes ////////// @@ -983,7 +983,7 @@ ex function::eval(int level) const exvector v = seq; GINAC_ASSERT(is_a(opt.symtree)); int sig = canonicalize(v.begin(), ex_to(opt.symtree)); - if (sig != INT_MAX) { + if (sig != std::numeric_limits::max()) { // Something has changed while sorting arguments, more evaluations later if (sig == 0) return _ex0; @@ -1052,9 +1052,19 @@ ${evalf_switch_statement} throw(std::logic_error("function::evalf(): invalid nparams")); } +/** + * This method is defined to be in line with behaviour of function::return_type() + */ +ex function::eval_ncmul(const exvector & v) const +{ + // If this function is called then the list of arguments is non-empty + // and the first argument is non-commutative, see function::return_type() + return seq.begin()->eval_ncmul(v); +} + unsigned function::calchash() const { - unsigned v = golden_ratio_hash(golden_ratio_hash((p_int)tinfo()) ^ serial); + unsigned v = golden_ratio_hash(make_hash_seed(typeid(*this)) ^ serial); for (size_t i=0; iop(i).gethash(); @@ -1245,7 +1255,7 @@ unsigned function::return_type() const } } -tinfo_t function::return_type_tinfo() const +return_type_t function::return_type_tinfo() const { GINAC_ASSERT(serial(); else return seq.begin()->return_type_tinfo(); } @@ -1302,8 +1312,8 @@ ex function::power(const ex & power_param) const // power of function // No derivative defined? Then return abstract derivative object if (opt.power_f == NULL) - return (new power::power(*this, power_param))->setflag(status_flags::dynallocated | - status_flags::evaluated); + return (new GiNaC::power(*this, power_param))->setflag(status_flags::dynallocated | + status_flags::evaluated); current_serial = serial; if (opt.power_use_exvector_args) @@ -1318,8 +1328,8 @@ ${power_switch_statement} std::vector & function::registered_functions() { - static std::vector * rf = new std::vector; - return *rf; + static std::vector rf = std::vector(); + return rf; } bool function::lookup_remember_table(ex & result) const