container.pl: can now generate constructors for an arbitary number
authorAlexander Frink <Alexander.Frink@uni-mainz.de>
Mon, 21 Feb 2000 23:11:41 +0000 (23:11 +0000)
committerAlexander Frink <Alexander.Frink@uni-mainz.de>
Mon, 21 Feb 2000 23:11:41 +0000 (23:11 +0000)
    of arguments
function.pl: new concept for specifying options for functions,
    take a look at the function_options class
    first experimental support for remembering functions
    IMPORTANT: the syntax of the macro REGISTER_FUNCTION() has
    changed incompatibly (see inifcns.cpp for an example)
flags.h: flags for remembering strategies (lru, lfu,...)
inifcns*.cpp: use the new REGISTER_FUNCTION() macro syntax
numeric.h/cpp: hashing for numbers using CLN's cl_equal_hashcode()
    seems to give increased performance
simp_lor.h: simplify_simp_lor can be called without scalar products list
structure.pl: bug fix in regular expression
normal.cpp: bug fix, a_numeric.compare(_ex0)

13 files changed:
ginac/container.pl
ginac/flags.h
ginac/function.pl
ginac/inifcns.cpp
ginac/inifcns_gamma.cpp
ginac/inifcns_trans.cpp
ginac/inifcns_zeta.cpp
ginac/matrix.cpp
ginac/normal.cpp
ginac/numeric.cpp
ginac/numeric.h
ginac/simp_lor.h
ginac/structure.pl

index 0ef3b896d47908f8c4355b1a86637b75c9120d59..bab6a88c34919824a46bd7dd0202ca65eb1ed533 100755 (executable)
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
-if ($#ARGV!=0) {
-    die 'usage: container.pl type (type=lst or exprseq)';
+if (($#ARGV!=0) and ($#ARGV!=1)) {
+    die 'usage: container.pl type [maxargs] (type=lst or exprseq)';
 }
 
 if ($ARGV[0] eq 'lst') {
@@ -12,8 +12,11 @@ if ($ARGV[0] eq 'lst') {
     die 'only lst and exprseq supported';
 }
 
-#$type='lst';
-#$type='exprseq';
+if ($#ARGV==1) {
+    $maxargs=$ARGV[1];
+} else {
+    $maxargs=15; # must be greater or equal than the value used in function.pl
+}
 
 if ($type eq 'exprseq') {
 
@@ -86,6 +89,57 @@ END_OF_LET_OP_IMPLEMENTATION
     $LET_OP_IMPLEMENTATION="// ${CONTAINER}::let_op() will be implemented by user elsewhere";
 }
 
+sub generate_seq {
+    my ($seq_template,$n,$separator)=@_;
+    my ($res,$N);
+    
+    $res='';
+    for ($N=1; $N<=$n; $N++) {
+        $res .= eval('"' . $seq_template . '"');
+        if ($N!=$n) {
+            $res .= $separator;
+        }
+    }
+    return $res;
+}
+
+sub generate_from_to {
+    my ($template,$seq_template1,$seq_separator1,$seq_template2,
+        $seq_separator2,$from,$to)=@_;
+    my ($res,$N,$SEQ);
+
+    $res='';
+    for ($N=$from; $N<=$to; $N++) {
+        $SEQ1=generate_seq($seq_template1,$N,$seq_separator1);
+        $SEQ2=generate_seq($seq_template2,$N,$seq_separator2);
+        $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_separator1,$seq_template2,
+        $seq_separator2)=@_;
+    return generate_from_to($template,$seq_template1,$seq_separator1,
+                            $seq_template2,$seq_separator2,1,$maxargs);
+}
+
+$constructors_interface=generate(
+'    explicit ${CONTAINER}(${SEQ1});'."\n",
+'const ex & param${N}',', ','','');
+
+$constructors_implementation=generate(
+    <<'END_OF_CONSTRUCTORS_IMPLEMENTATION','const ex & param${N}',', ','    seq.push_back(param${N});',"\n");
+${CONTAINER}::${CONTAINER}(${SEQ1}) : basic(TINFO_${CONTAINER})
+{
+    debugmsg(\"${CONTAINER} constructor from ${N}*ex\",LOGLEVEL_CONSTRUCT);
+    RESERVE(seq,${N});
+${SEQ2}
+}
+END_OF_CONSTRUCTORS_IMPLEMENTATION
+
 $interface=<<END_OF_INTERFACE;
 /** \@file ${CONTAINER}.h
  *
@@ -101,6 +155,7 @@ $interface=<<END_OF_INTERFACE;
  *                        \$let_op=${let_op}
  *                        \$open_bracket=${open_bracket}
  *                        \$close_bracket=${close_bracket}
+ *                        \$maxargs=${maxargs}
  *
  *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
  *
@@ -153,28 +208,7 @@ protected:
 public:
     ${CONTAINER}(${STLT} const & s, bool discardable=0);
     ${CONTAINER}(${STLT} * vp); // vp will be deleted
-    explicit ${CONTAINER}(const ex & e1);
-    explicit ${CONTAINER}(const ex & e1, const ex & e2);
-    explicit ${CONTAINER}(const ex & e1, const ex & e2, const ex & e3);
-    explicit ${CONTAINER}(const ex & e1, const ex & e2, const ex & e3,
-             const ex & e4);
-    explicit ${CONTAINER}(const ex & e1, const ex & e2, const ex & e3,
-             const ex & e4, const ex & e5);
-    explicit ${CONTAINER}(const ex & e1, const ex & e2, const ex & e3,
-             const ex & e4, const ex & e5, const ex & e6);
-    explicit ${CONTAINER}(const ex & e1, const ex & e2, const ex & e3,
-             const ex & e4, const ex & e5, const ex & e6,
-             const ex & e7);
-    explicit ${CONTAINER}(const ex & e1, const ex & e2, const ex & e3,
-             const ex & e4, const ex & e5, const ex & e6,
-             const ex & e7, const ex & e8);
-    explicit ${CONTAINER}(const ex & e1, const ex & e2, const ex & e3,
-             const ex & e4, const ex & e5, const ex & e6,
-             const ex & e7, const ex & e8, const ex & e9);
-    explicit ${CONTAINER}(const ex & e1, const ex & e2, const ex & e3,
-             const ex & e4, const ex & e5, const ex & e6,
-             const ex & e7, const ex & e8, const ex & e9,
-             const ex &e10);
+${constructors_interface}
 
 public:
     basic * duplicate() const;
@@ -259,6 +293,7 @@ $implementation=<<END_OF_IMPLEMENTATION;
  *                        \$let_op=${let_op}
  *                        \$open_bracket=${open_bracket}
  *                        \$close_bracket=${close_bracket}
+ *                        \$maxargs=${maxargs}
  *
  *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
  *
@@ -365,146 +400,7 @@ ${CONTAINER}::${CONTAINER}(${STLT} * vp) : basic(TINFO_${CONTAINER})
     delete vp;
 }
 
-${CONTAINER}::${CONTAINER}(const ex & e1) :  basic(TINFO_${CONTAINER})
-{
-    debugmsg("${CONTAINER} constructor from 1 ex",
-             LOGLEVEL_CONSTRUCT);
-    RESERVE(seq,1);
-    seq.push_back(e1);
-}
-
-${CONTAINER}::${CONTAINER}(const ex & e1, const ex & e2) : basic(TINFO_${CONTAINER})
-{
-    debugmsg("${CONTAINER} constructor from 2 ex",
-             LOGLEVEL_CONSTRUCT);
-    RESERVE(seq,2);
-    seq.push_back(e1);
-    seq.push_back(e2);
-}
-
-${CONTAINER}::${CONTAINER}(const ex & e1, const ex & e2, const ex & e3)
-    : basic(TINFO_${CONTAINER})
-{
-    debugmsg("${CONTAINER} constructor from 3 ex",
-             LOGLEVEL_CONSTRUCT);
-    RESERVE(seq,3);
-    seq.push_back(e1);
-    seq.push_back(e2);
-    seq.push_back(e3);
-}
-
-${CONTAINER}::${CONTAINER}(const ex & e1, const ex & e2, const ex & e3,
-                     const ex & e4) : basic(TINFO_${CONTAINER})
-{
-    debugmsg("${CONTAINER} constructor from 4 ex",
-             LOGLEVEL_CONSTRUCT);
-    RESERVE(seq,4);
-    seq.push_back(e1);
-    seq.push_back(e2);
-    seq.push_back(e3);
-    seq.push_back(e4);
-}
-
-${CONTAINER}::${CONTAINER}(const ex & e1, const ex & e2, const ex & e3,
-                     const ex & e4, const ex & e5) : basic(TINFO_${CONTAINER})
-{
-    debugmsg("${CONTAINER} constructor from 5 ex",
-             LOGLEVEL_CONSTRUCT);
-    RESERVE(seq,5);
-    seq.push_back(e1);
-    seq.push_back(e2);
-    seq.push_back(e3);
-    seq.push_back(e4);
-    seq.push_back(e5);
-}
-
-${CONTAINER}::${CONTAINER}(const ex & e1, const ex & e2, const ex & e3,
-                     const ex & e4, const ex & e5, const ex & e6)
-    : basic(TINFO_${CONTAINER})
-{
-    debugmsg("${CONTAINER} constructor from 6 ex",
-             LOGLEVEL_CONSTRUCT);
-    RESERVE(seq,6);
-    seq.push_back(e1);
-    seq.push_back(e2);
-    seq.push_back(e3);
-    seq.push_back(e4);
-    seq.push_back(e5);
-    seq.push_back(e6);
-}
-
-${CONTAINER}::${CONTAINER}(const ex & e1, const ex & e2, const ex & e3,
-                     const ex & e4, const ex & e5, const ex & e6,
-                     const ex & e7) : basic(TINFO_${CONTAINER})
-{
-    debugmsg("${CONTAINER} constructor from 7 ex",
-             LOGLEVEL_CONSTRUCT);
-    RESERVE(seq,7);
-    seq.push_back(e1);
-    seq.push_back(e2);
-    seq.push_back(e3);
-    seq.push_back(e4);
-    seq.push_back(e5);
-    seq.push_back(e6);
-    seq.push_back(e7);
-}
-
-${CONTAINER}::${CONTAINER}(const ex & e1, const ex & e2, const ex & e3,
-                     const ex & e4, const ex & e5, const ex & e6,
-                     const ex & e7, const ex & e8) : basic(TINFO_${CONTAINER})
-{
-    debugmsg("${CONTAINER} constructor from 8 ex",
-             LOGLEVEL_CONSTRUCT);
-    RESERVE(seq,8);
-    seq.push_back(e1);
-    seq.push_back(e2);
-    seq.push_back(e3);
-    seq.push_back(e4);
-    seq.push_back(e5);
-    seq.push_back(e6);
-    seq.push_back(e7);
-    seq.push_back(e8);
-}
-
-${CONTAINER}::${CONTAINER}(const ex & e1, const ex & e2, const ex & e3,
-                     const ex & e4, const ex & e5, const ex & e6,
-                     const ex & e7, const ex & e8, const ex & e9)
-    : basic(TINFO_${CONTAINER})
-{
-    debugmsg("${CONTAINER} constructor from 9 ex",
-             LOGLEVEL_CONSTRUCT);
-    RESERVE(seq,9);
-    seq.push_back(e1);
-    seq.push_back(e2);
-    seq.push_back(e3);
-    seq.push_back(e4);
-    seq.push_back(e5);
-    seq.push_back(e6);
-    seq.push_back(e7);
-    seq.push_back(e8);
-    seq.push_back(e9);
-}
-
-${CONTAINER}::${CONTAINER}(const ex & e1, const ex & e2, const ex & e3,
-                     const ex & e4, const ex & e5, const ex & e6,
-                     const ex & e7, const ex & e8, const ex & e9,
-                     const ex &e10)
-    : basic(TINFO_${CONTAINER})
-{
-    debugmsg("${CONTAINER} constructor from 10 ex",
-             LOGLEVEL_CONSTRUCT);
-    RESERVE(seq,10);
-    seq.push_back(e1);
-    seq.push_back(e2);
-    seq.push_back(e3);
-    seq.push_back(e4);
-    seq.push_back(e5);
-    seq.push_back(e6);
-    seq.push_back(e7);
-    seq.push_back(e8);
-    seq.push_back(e9);
-    seq.push_back(e10);
-}
+${constructors_implementation}
 
 //////////
 // archiving
index 0152c01e1931c3ba87fbe31dfc8d1c6762b5822d..16228a2d32a604662dacd94ea8f99329fcaaa22e 100644 (file)
@@ -118,6 +118,15 @@ public:
        };
 };
 
+class remember_strategies {
+public:
+    enum { delete_never, // let table grow undefinitely, not recommmended, but currently default
+           delete_lru,   // least recently used
+           delete_lfu,   // least frequently used
+           delete_cyclic // first one in list (oldest)
+    };
+};
+
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
 #endif // ndef NO_NAMESPACE_GINAC
index 6dbee8bb1039b6385f016555ed24f2ced46c351e..a680fc8685562b67630521aadb2dfa702eb2cc12 100755 (executable)
@@ -16,12 +16,12 @@ sub generate_seq {
     return $res;
 }
 
-sub generate {
-    my ($template,$seq_template1,$seq_template2)=@_;
+sub generate_from_to {
+    my ($template,$seq_template1,$seq_template2,$from,$to)=@_;
     my ($res,$N,$SEQ);
 
     $res='';
-    for ($N=1; $N<=$maxargs; $N++) {
+    for ($N=$from; $N<=$to; $N++) {
         $SEQ1=generate_seq($seq_template1,$N);
         $SEQ2=generate_seq($seq_template2,$N);
         $res .= eval('"' . $template . '"');
@@ -31,8 +31,56 @@ sub generate {
     return $res;
 }
 
-$declare_function_macro_namespace=generate(
-    <<'END_OF_DECLARE_FUNCTION_MACRO_NAMESPACE','const GiNaC::ex & p${N}','p${N}');
+sub generate {
+    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); \
+}
+#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); \
+}
+
+#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);
 #define DECLARE_FUNCTION_${N}P(NAME) \\
 extern const unsigned function_index_##NAME; \\
 inline GiNaC::function NAME(${SEQ1}) { \\
@@ -41,8 +89,51 @@ inline GiNaC::function NAME(${SEQ1}) { \\
 
 END_OF_DECLARE_FUNCTION_MACRO_NAMESPACE
 
-$declare_function_macro_no_namespace=generate(
-    <<'END_OF_DECLARE_FUNCTION_MACRO_NO_NAMESPACE','const ex & p${N}','p${N}');
+$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)); \
+}
+#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)); \
+}
+
+#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);
 #define DECLARE_FUNCTION_${N}P(NAME) \\
 extern const unsigned function_index_##NAME; \\
 inline function NAME(${SEQ1}) { \\
@@ -67,15 +158,18 @@ $typedef_series_funcp=generate(
 'typedef ex (* series_funcp_${N})(${SEQ1}, const symbol &, const ex &, int);'."\n",
 'const ex &','');
 
+$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",'','');
+
+$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",'','');
+
 $constructors_interface=generate(
 '    function(unsigned ser, ${SEQ1});'."\n",
 'const ex & param${N}','');
 
-$register_new_interface=generate(
-'    static unsigned register_new(const char * nm, eval_funcp_${N} e,'."\n".
-'                                 evalf_funcp_${N} ef=0, derivative_funcp_${N} d=0, series_funcp_${N} s=0);'.
-"\n",'','');
-
 $constructors_implementation=generate(
     <<'END_OF_CONSTRUCTORS_IMPLEMENTATION','const ex & param${N}','param${N}');
 function::function(unsigned ser, ${SEQ1})
@@ -87,23 +181,23 @@ function::function(unsigned ser, ${SEQ1})
 END_OF_CONSTRUCTORS_IMPLEMENTATION
 
 $eval_switch_statement=generate(
-    <<'END_OF_EVAL_SWITCH_STATEMENT','eseq[${N}-1]','');
+    <<'END_OF_EVAL_SWITCH_STATEMENT','seq[${N}-1]','');
     case ${N}:
-        return ((eval_funcp_${N})(registered_functions()[serial].e))(${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]','');
     case ${N}:
-        return ((evalf_funcp_${N})(registered_functions()[serial].ef))(${SEQ1});
+        return ((evalf_funcp_${N})(registered_functions()[serial].evalf_f))(${SEQ1});
         break;
 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].d))(${SEQ1},diff_param);
+        return ((derivative_funcp_${N})(registered_functions()[serial].derivative_f))(${SEQ1},diff_param);
         break;
 END_OF_DIFF_SWITCH_STATEMENT
 
@@ -111,7 +205,7 @@ $series_switch_statement=generate(
     <<'END_OF_SERIES_SWITCH_STATEMENT','seq[${N}-1]','');
     case ${N}:
         try {
-            res = ((series_funcp_${N})(registered_functions()[serial].s))(${SEQ1},s,point,order);
+            res = ((series_funcp_${N})(registered_functions()[serial].series_f))(${SEQ1},s,point,order);
         } catch (do_taylor) {
             res = basic::series(s, point, order);
         }
@@ -119,17 +213,45 @@ $series_switch_statement=generate(
         break;
 END_OF_SERIES_SWITCH_STATEMENT
 
-$register_new_implementation=generate(
-    <<'END_OF_REGISTER_NEW_IMPLEMENTATION','','');
-unsigned function::register_new(const char * nm, eval_funcp_${N} e,
-                                 evalf_funcp_${N} ef, derivative_funcp_${N} d, series_funcp_${N} s)
+$eval_func_implementation=generate(
+    <<'END_OF_EVAL_FUNC_IMPLEMENTATION','','');
+function_options & function_options::eval_func(eval_funcp_${N} e)
 {
-    registered_function_info rfi={nm,${N},0,eval_funcp(e),
-                                  evalf_funcp(ef),derivative_funcp(d),series_funcp(s)};
-    registered_functions().push_back(rfi);
-    return registered_functions().size()-1;
-}
-END_OF_REGISTER_NEW_IMPLEMENTATION
+    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','','');
+function_options & function_options::evalf_func(evalf_funcp_${N} ef)
+{
+    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','','');
+function_options & function_options::derivative_func(derivative_funcp_${N} d)
+{
+    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','','');
+function_options & function_options::series_func(series_funcp_${N} s)
+{
+    test_and_set_nparams(${N});
+    series_f=series_funcp(s);
+    return *this;
+}        
+END_OF_SERIES_FUNC_IMPLEMENTATION
 
 $interface=<<END_OF_INTERFACE;
 /** \@file function.h
@@ -187,13 +309,31 @@ $declare_function_macro_no_namespace
 
 #ifndef NO_NAMESPACE_GINAC
 
-#define REGISTER_FUNCTION(NAME,E,EF,D,S) \\
-const unsigned function_index_##NAME=GiNaC::function::register_new(#NAME,E,EF,D,S);
+#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,E,EF,D,S) \\
-const unsigned function_index_##NAME=function::register_new(#NAME,E,EF,D,S);
+#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
 
@@ -245,14 +385,53 @@ $typedef_derivative_funcp
 $typedef_series_funcp
 // end of generated lines
 
-struct registered_function_info {
-    const char * name;
+class function_options
+{
+    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());
+// 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; }
+
+protected:
+    string name;
+    string TeX_name;
+
     unsigned nparams;
-    unsigned options;
-    eval_funcp e;
-    evalf_funcp ef;
-    derivative_funcp d;
-    series_funcp s;
+
+    eval_funcp eval_f;
+    evalf_funcp evalf_f;
+    derivative_funcp derivative_f;
+    series_funcp series_f;
+
+    bool evalf_params_first;
+
+    bool use_return_type;
+    unsigned return_type;
+    unsigned return_type_tinfo;
+
+    bool use_remember;
+    unsigned remember_size;
+    unsigned remember_assoc_size;
+    unsigned remember_strategy;
+
+    unsigned functions_with_same_name;
 };
 
 /** The class function is used to implement builtin functions like sin, cos...
@@ -264,6 +443,10 @@ class function : public exprseq
     // CINT has a linking problem
     friend void ginsh_get_ginac_functions(void);
 
+    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
@@ -312,11 +495,11 @@ protected:
     // non-virtual functions in this class
 protected:
     ex pderivative(unsigned diff_param) const; // partial differentiation
-    static vector<registered_function_info> & registered_functions(void);
+    static vector<function_options> & registered_functions(void);
+    bool lookup_remember_table(ex & result) const;
+    void store_remember_table(ex const & result) const;
 public:
-    // the following lines have been generated for max. ${maxargs} parameters
-$register_new_interface
-    // end of generated lines
+    static unsigned register_new(function_options const & opt);
     unsigned getserial(void) const {return serial;}
     
 // member variables
@@ -381,6 +564,7 @@ $implementation=<<END_OF_IMPLEMENTATION;
 
 #include <string>
 #include <stdexcept>
+#include <list>
 
 #include "function.h"
 #include "ex.h"
@@ -393,6 +577,204 @@ $implementation=<<END_OF_IMPLEMENTATION;
 namespace GiNaC {
 #endif // ndef NO_NAMESPACE_GINAC
 
+function_options::function_options()
+{
+    initialize();
+}
+
+function_options::function_options(string const & n, string const & tn)
+{
+    initialize();
+    set_name(n,tn);
+}
+
+function_options::~function_options()
+{
+    // nothing to clean up at the moment
+}
+
+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;
+}
+
+function_options & function_options::set_name(string const & n,
+                                              string const & tn)
+{
+    name=n;
+    if (tn==string()) {
+        TeX_name="\\\\operatorname{"+name+"}";
+    } else {
+        TeX_name=tn;
+    }
+    return *this;
+}
+
+// the following lines have been generated for max. ${maxargs} parameters
+$eval_func_implementation
+$evalf_func_implementation
+$derivative_func_implementation
+$series_func_implementation
+// end of generated lines
+
+function_options & function_options::set_return_type(unsigned rt, unsigned 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;
+    return *this;
+}
+
+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;
+    return *this;
+}
+
+function_options & function_options::overloaded(unsigned o)
+{
+    functions_with_same_name=o;
+    return *this;
+}
+    
+void function_options::test_and_set_nparams(unsigned n)
+{
+    if (nparams==0) {
+        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
+        // caught anyhow
+        cerr << "WARNING: number of parameters ("
+             << n << ") differs from number set before (" 
+             << nparams << ")" << endl;
+    }
+}
+
+class remember_table_entry {
+public:
+    remember_table_entry(function const & f, ex const & r) :
+        hashvalue(f.gethash()), seq(f.seq), result(r)
+    {
+        last_access=0;
+        successful_hits=0;
+    }
+    bool is_equal(function const & f) const
+    {
+        GINAC_ASSERT(f.seq.size()==seq.size());
+        if (f.gethash()!=hashvalue) return false;
+        for (unsigned i=0; i<seq.size(); ++i) {
+            if (!seq[i].is_equal(f.seq[i])) return false;
+        }
+        last_access=access_counter++;
+        successful_hits++;
+        return true;
+    }
+    unsigned hashvalue;
+    exvector seq;
+    ex result;
+    mutable unsigned long last_access;
+    mutable unsigned successful_hits;
+
+    static unsigned access_counter;
+};    
+
+unsigned remember_table_entry::access_counter=0;
+
+class remember_table_list : public list<remember_table_entry> {
+public:
+    remember_table_list()
+    {
+        max_assoc_size=0;
+        delete_strategy=0;
+    }
+    remember_table_list(unsigned as, unsigned strat)
+    {
+        max_assoc_size=as;
+        delete_strategy=strat;
+    }
+    void add_entry(function const & f, ex const & result)
+    {
+        push_back(remember_table_entry(f,result));
+    }        
+    bool lookup_entry(function const & f, ex & result) const
+    {
+        for (const_iterator cit=begin(); cit!=end(); ++cit) {
+            if (cit->is_equal(f)) {
+                result=cit->result;
+                return true;
+            }
+        }
+        return false;
+    }
+protected:
+    unsigned max_assoc_size;
+    unsigned delete_strategy;
+};
+
+
+class remember_table : public vector<remember_table_list> {
+public:
+    remember_table()
+    {
+    }
+    remember_table(unsigned s, unsigned as, unsigned strat)
+    {
+        calc_size(s);
+        reserve(table_size);
+        for (unsigned i=0; i<table_size; ++i) {
+            push_back(remember_table_list(as,strat));
+        }
+    }
+    bool lookup_entry(function const & f, ex & result) const
+    {
+        unsigned entry=f.gethash() & (table_size-1);
+        if (entry>=size()) {
+            cerr << "entry=" << entry << ",size=" << size() << endl;
+        }
+        GINAC_ASSERT(entry<size());
+        return operator[](entry).lookup_entry(f,result);
+    }
+    void add_entry(function const & f, ex const & result)
+    {
+        unsigned entry=f.gethash() & (table_size-1);
+        GINAC_ASSERT(entry<size());
+        operator[](entry).add_entry(f,result);
+    }        
+    void calc_size(unsigned s)
+    {
+        // use some power of 2 next to s
+        table_size=1 << log2(s);
+    }
+protected:
+    unsigned table_size;
+};      
+
+// this is not declared as a static function in the class function
+// (like registered_function()) because of issues with cint
+static vector<remember_table> & remember_tables(void)
+{
+    static vector<remember_table> * rt=new vector<remember_table>;
+    return *rt;
+}
+
 GINAC_IMPLEMENT_REGISTERED_CLASS(function, exprseq)
 
 //////////
@@ -491,7 +873,7 @@ function::function(const archive_node &n, const lst &sym_lst) : inherited(n, sym
     string s;
     if (n.find_string("name", s)) {
         unsigned int ser = 0;
-        vector<registered_function_info>::const_iterator i = registered_functions().begin(), iend = registered_functions().end();
+        vector<function_options>::const_iterator i = registered_functions().begin(), iend = registered_functions().end();
         while (i != iend) {
             if (s == i->name) {
                 serial = ser;
@@ -605,17 +987,32 @@ ex function::eval(int level) const
 {
     GINAC_ASSERT(serial<registered_functions().size());
 
-    exvector eseq=evalchildren(level);    
+    if (level>1) {
+        // first evaluate children, then we will end up here again
+        return function(serial,evalchildren(level));
+    }
 
-    if (registered_functions()[serial].e==0) {
-        return function(serial,eseq).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;
     }
+
     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);
     }
-    throw(std::logic_error("function::eval(): invalid nparams"));
+    return eval_result;
 }
 
 ex function::evalf(int level) const
@@ -624,7 +1021,7 @@ ex function::evalf(int level) const
 
     exvector eseq=evalfchildren(level);
     
-    if (registered_functions()[serial].ef==0) {
+    if (registered_functions()[serial].evalf_f==0) {
         return function(serial,eseq).hold();
     }
     switch (registered_functions()[serial].nparams) {
@@ -651,7 +1048,7 @@ ex function::series(const symbol & s, const ex & point, int order) const
 {
     GINAC_ASSERT(serial<registered_functions().size());
 
-    if (registered_functions()[serial].s==0) {
+    if (registered_functions()[serial].series_f==0) {
         return basic::series(s, point, order);
     }
     ex res;
@@ -745,7 +1142,7 @@ ex function::pderivative(unsigned diff_param) const // partial differentiation
 {
     GINAC_ASSERT(serial<registered_functions().size());
     
-    if (registered_functions()[serial].d==0) {
+    if (registered_functions()[serial].derivative_f==0) {
         throw(std::logic_error(string("function::pderivative(") + registered_functions()[serial].name + "): no diff function defined"));
     }
     switch (registered_functions()[serial].nparams) {
@@ -756,17 +1153,49 @@ ${diff_switch_statement}
     throw(std::logic_error("function::pderivative(): no diff function defined"));
 }
 
-vector<registered_function_info> & function::registered_functions(void)
+vector<function_options> & function::registered_functions(void)
 {
-    static vector<registered_function_info> * rf=new vector<registered_function_info>;
+    static vector<function_options> * rf=new vector<function_options>;
     return *rf;
 }
 
+bool function::lookup_remember_table(ex & result) const
+{
+    return remember_tables()[serial].lookup_entry(*this,result);
+}
+
+void function::store_remember_table(ex const & result) const
+{
+    remember_tables()[serial].add_entry(*this,result);
+}
+
 // public
 
-// the following lines have been generated for max. ${maxargs} parameters
-$register_new_implementation
-// end of generated lines
+unsigned function::register_new(function_options const & opt)
+{
+    unsigned same_name=0;
+    for (unsigned i=0; i<registered_functions().size(); ++i) {
+        if (registered_functions()[i].name==opt.name) {
+            same_name++;
+        }
+    }
+    if (same_name>=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_tables().push_back(remember_table(opt.remember_size,
+                                                   opt.remember_assoc_size,
+                                                   opt.remember_strategy));
+    } else {
+        remember_tables().push_back(remember_table());
+    }
+    return registered_functions().size()-1;
+}
 
 //////////
 // static member variables
index 70eaf758a104bf0564d78a647e1e0e4960fc42ec..b3527e9c5a06475e1ec721080a35e9c0a805e9e6 100644 (file)
@@ -62,7 +62,8 @@ static ex abs_eval(const ex & x)
         return abs(x).hold();
 }
 
-REGISTER_FUNCTION(abs, abs_eval, abs_evalf, NULL, NULL);
+REGISTER_FUNCTION(abs, evalf_func(abs_eval).
+                       evalf_func(abs_evalf));
 
 //////////
 // dilogarithm
@@ -79,7 +80,7 @@ static ex Li2_eval(const ex & x)
     return Li2(x).hold();
 }
 
-REGISTER_FUNCTION(Li2, Li2_eval, NULL, NULL, NULL);
+REGISTER_FUNCTION(Li2, eval_func(Li2_eval));
 
 //////////
 // trilogarithm
@@ -92,7 +93,7 @@ static ex Li3_eval(const ex & x)
     return Li3(x).hold();
 }
 
-REGISTER_FUNCTION(Li3, Li3_eval, NULL, NULL, NULL);
+REGISTER_FUNCTION(Li3, eval_func(Li3_eval));
 
 //////////
 // factorial
@@ -111,7 +112,8 @@ static ex factorial_eval(const ex & x)
         return factorial(x).hold();
 }
 
-REGISTER_FUNCTION(factorial, factorial_eval, factorial_evalf, NULL, NULL);
+REGISTER_FUNCTION(factorial, eval_func(factorial_eval).
+                             evalf_func(factorial_evalf));
 
 //////////
 // binomial
@@ -130,7 +132,8 @@ static ex binomial_eval(const ex & x, const ex &y)
         return binomial(x, y).hold();
 }
 
-REGISTER_FUNCTION(binomial, binomial_eval, binomial_evalf, NULL, NULL);
+REGISTER_FUNCTION(binomial, eval_func(binomial_eval).
+                            evalf_func(binomial_evalf));
 
 //////////
 // Order term function (for truncated power series)
@@ -163,7 +166,8 @@ static ex Order_series(const ex & x, const symbol & s, const ex & point, int ord
        return pseries(s, point, new_seq);
 }
 
-REGISTER_FUNCTION(Order, Order_eval, NULL, NULL, Order_series);
+REGISTER_FUNCTION(Order, eval_func(Order_eval).
+                         series_func(Order_series));
 
 //////////
 // Solve linear system
index 9e96fda8ae83646c7e2f6b2799b819bd79f15246..7480bf204385814a5fbe68b3212be4c04caf76aa 100644 (file)
@@ -126,7 +126,10 @@ static ex gamma_series(const ex & x, const symbol & s, const ex & pt, int order)
 }
 
 
-REGISTER_FUNCTION(gamma, gamma_eval, gamma_evalf, gamma_deriv, gamma_series);
+REGISTER_FUNCTION(gamma, eval_func(gamma_eval).
+                         evalf_func(gamma_evalf).
+                         derivative_func(gamma_deriv).
+                         series_func(gamma_series));
 
 
 //////////
@@ -229,7 +232,10 @@ static ex beta_series(const ex & x, const ex & y, const symbol & s, const ex & p
 }
 
 
-REGISTER_FUNCTION(beta, beta_eval, beta_evalf, beta_deriv, beta_series);
+REGISTER_FUNCTION(beta, eval_func(beta_eval).
+                        evalf_func(beta_evalf).
+                        derivative_func(beta_deriv).
+                        series_func(beta_series));
 
 
 //////////
@@ -319,7 +325,13 @@ static ex psi1_series(const ex & x, const symbol & s, const ex & pt, int order)
     return (psi(x+m+_ex1())-recur).series(s, pt, order);
 }
 
-const unsigned function_index_psi1 = function::register_new("psi", psi1_eval, psi1_evalf, psi1_deriv, psi1_series);
+const unsigned function_index_psi1 =
+    function::register_new(function_options("psi").
+                           eval_func(psi1_eval).
+                           evalf_func(psi1_evalf).
+                          derivative_func(psi1_deriv).
+                          series_func(psi1_series).
+                          overloaded(2));
 
 //////////
 // Psi-functions (aka polygamma-functions)  psi(0,x)==psi(x)
@@ -435,7 +447,14 @@ static ex psi2_series(const ex & n, const ex & x, const symbol & s, const ex & p
     return (psi(n, x+m+_ex1())-recur).series(s, pt, order);
 }
 
-const unsigned function_index_psi2 = function::register_new("psi", psi2_eval, psi2_evalf, psi2_deriv, psi2_series);
+const unsigned function_index_psi2 =
+    function::register_new(function_options("psi").
+                           eval_func(psi2_eval).
+                           evalf_func(psi2_evalf).
+                          derivative_func(psi2_deriv).
+                          series_func(psi2_series).
+                          overloaded(2));
+
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
index e0d0999b64a138cf3f8c46f6e7b447714d5157dc..14921f46cccd3eec28084c7d3c82b6f413ca521c 100644 (file)
@@ -88,7 +88,9 @@ static ex exp_deriv(const ex & x, unsigned deriv_param)
     return exp(x);
 }
 
-REGISTER_FUNCTION(exp, exp_eval, exp_evalf, exp_deriv, NULL);
+REGISTER_FUNCTION(exp, eval_func(exp_eval).
+                       evalf_func(exp_evalf).
+                       derivative_func(exp_deriv));
 
 //////////
 // natural logarithm
@@ -141,7 +143,9 @@ static ex log_deriv(const ex & x, unsigned deriv_param)
     return power(x, _ex_1());
 }
 
-REGISTER_FUNCTION(log, log_eval, log_evalf, log_deriv, NULL);
+REGISTER_FUNCTION(log, eval_func(log_eval).
+                       evalf_func(log_evalf).
+                       derivative_func(log_deriv));
 
 //////////
 // sine (trigonometric function)
@@ -220,7 +224,9 @@ static ex sin_deriv(const ex & x, unsigned deriv_param)
     return cos(x);
 }
 
-REGISTER_FUNCTION(sin, sin_eval, sin_evalf, sin_deriv, NULL);
+REGISTER_FUNCTION(sin, eval_func(sin_eval).
+                       evalf_func(sin_evalf).
+                       derivative_func(sin_deriv));
 
 //////////
 // cosine (trigonometric function)
@@ -299,7 +305,9 @@ static ex cos_deriv(const ex & x, unsigned deriv_param)
     return _ex_1()*sin(x);
 }
 
-REGISTER_FUNCTION(cos, cos_eval, cos_evalf, cos_deriv, NULL);
+REGISTER_FUNCTION(cos, eval_func(cos_eval).
+                       evalf_func(cos_evalf).
+                       derivative_func(cos_deriv));
 
 //////////
 // tangent (trigonometric function)
@@ -387,7 +395,10 @@ static ex tan_series(const ex & x, const symbol & s, const ex & pt, int order)
     return (sin(x)/cos(x)).series(s, pt, order+2);
 }
 
-REGISTER_FUNCTION(tan, tan_eval, tan_evalf, tan_deriv, tan_series);
+REGISTER_FUNCTION(tan, eval_func(tan_eval).
+                       evalf_func(tan_evalf).
+                       derivative_func(tan_deriv).
+                       series_func(tan_series));
 
 //////////
 // inverse sine (arc sine)
@@ -436,7 +447,9 @@ static ex asin_deriv(const ex & x, unsigned deriv_param)
     return power(1-power(x,_ex2()),_ex_1_2());
 }
 
-REGISTER_FUNCTION(asin, asin_eval, asin_evalf, asin_deriv, NULL);
+REGISTER_FUNCTION(asin, eval_func(asin_eval).
+                        evalf_func(asin_evalf).
+                        derivative_func(asin_deriv));
 
 //////////
 // inverse cosine (arc cosine)
@@ -485,7 +498,9 @@ static ex acos_deriv(const ex & x, unsigned deriv_param)
     return _ex_1()*power(1-power(x,_ex2()),_ex_1_2());
 }
 
-REGISTER_FUNCTION(acos, acos_eval, acos_evalf, acos_deriv, NULL);
+REGISTER_FUNCTION(acos, eval_func(acos_eval).
+                        evalf_func(acos_evalf).
+                        derivative_func(acos_deriv));
 
 //////////
 // inverse tangent (arc tangent)
@@ -522,7 +537,9 @@ static ex atan_deriv(const ex & x, unsigned deriv_param)
     return power(_ex1()+power(x,_ex2()), _ex_1());
 }
 
-REGISTER_FUNCTION(atan, atan_eval, atan_evalf, atan_deriv, NULL);
+REGISTER_FUNCTION(atan, eval_func(atan_eval).
+                        evalf_func(atan_evalf).
+                        derivative_func(atan_deriv));
 
 //////////
 // inverse tangent (atan2(y,x))
@@ -560,7 +577,9 @@ static ex atan2_deriv(const ex & y, const ex & x, unsigned deriv_param)
     return -y*power(power(x,_ex2())+power(y,_ex2()),_ex_1());
 }
 
-REGISTER_FUNCTION(atan2, atan2_eval, atan2_evalf, atan2_deriv, NULL);
+REGISTER_FUNCTION(atan2, eval_func(atan2_eval).
+                         evalf_func(atan2_evalf).
+                         derivative_func(atan2_deriv));
 
 //////////
 // hyperbolic sine (trigonometric function)
@@ -612,7 +631,9 @@ static ex sinh_deriv(const ex & x, unsigned deriv_param)
     return cosh(x);
 }
 
-REGISTER_FUNCTION(sinh, sinh_eval, sinh_evalf, sinh_deriv, NULL);
+REGISTER_FUNCTION(sinh, eval_func(sinh_eval).
+                        evalf_func(sinh_evalf).
+                        derivative_func(sinh_deriv));
 
 //////////
 // hyperbolic cosine (trigonometric function)
@@ -664,7 +685,10 @@ static ex cosh_deriv(const ex & x, unsigned deriv_param)
     return sinh(x);
 }
 
-REGISTER_FUNCTION(cosh, cosh_eval, cosh_evalf, cosh_deriv, NULL);
+REGISTER_FUNCTION(cosh, eval_func(cosh_eval).
+                        evalf_func(cosh_evalf).
+                        derivative_func(cosh_deriv));
+
 
 //////////
 // hyperbolic tangent (trigonometric function)
@@ -728,7 +752,10 @@ static ex tanh_series(const ex & x, const symbol & s, const ex & pt, int order)
     return (sinh(x)/cosh(x)).series(s, pt, order+2);
 }
 
-REGISTER_FUNCTION(tanh, tanh_eval, tanh_evalf, tanh_deriv, tanh_series);
+REGISTER_FUNCTION(tanh, eval_func(tanh_eval).
+                        evalf_func(tanh_evalf).
+                        derivative_func(tanh_deriv).
+                        series_func(tanh_series));
 
 //////////
 // inverse hyperbolic sine (trigonometric function)
@@ -765,7 +792,9 @@ static ex asinh_deriv(const ex & x, unsigned deriv_param)
     return power(_ex1()+power(x,_ex2()),_ex_1_2());
 }
 
-REGISTER_FUNCTION(asinh, asinh_eval, asinh_evalf, asinh_deriv, NULL);
+REGISTER_FUNCTION(asinh, eval_func(asinh_eval).
+                         evalf_func(asinh_evalf).
+                         derivative_func(asinh_deriv));
 
 //////////
 // inverse hyperbolic cosine (trigonometric function)
@@ -808,7 +837,9 @@ static ex acosh_deriv(const ex & x, unsigned deriv_param)
     return power(x+_ex_1(),_ex_1_2())*power(x+_ex1(),_ex_1_2());
 }
 
-REGISTER_FUNCTION(acosh, acosh_eval, acosh_evalf, acosh_deriv, NULL);
+REGISTER_FUNCTION(acosh, eval_func(acosh_eval).
+                         evalf_func(acosh_evalf).
+                         derivative_func(acosh_deriv));
 
 //////////
 // inverse hyperbolic tangent (trigonometric function)
@@ -848,7 +879,9 @@ static ex atanh_deriv(const ex & x, unsigned deriv_param)
     return power(_ex1()-power(x,_ex2()),_ex_1());
 }
 
-REGISTER_FUNCTION(atanh, atanh_eval, atanh_evalf, atanh_deriv, NULL);
+REGISTER_FUNCTION(atanh, eval_func(atanh_eval).
+                         evalf_func(atanh_evalf).
+                         derivative_func(atanh_deriv));
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
index 63637374dfb8d4590a1f8d360aee94d0e56e83a0..7a8b089aa11131876f2d528dbd1f86c7a73cfe6f 100644 (file)
@@ -81,7 +81,12 @@ static ex zeta1_deriv(const ex & x, unsigned deriv_param)
     return zeta(_ex1(), x);
 }
 
-const unsigned function_index_zeta1 = function::register_new("zeta", zeta1_eval, zeta1_evalf, zeta1_deriv, NULL);
+const unsigned function_index_zeta1 =
+    function::register_new(function_options("zeta").
+                           eval_func(zeta1_eval).
+                           evalf_func(zeta1_evalf).
+                          derivative_func(zeta1_deriv).
+                          overloaded(2));
 
 //////////
 // Derivatives of Riemann's Zeta-function  zeta(0,x)==zeta(x)
@@ -110,7 +115,11 @@ static ex zeta2_deriv(const ex & n, const ex & x, unsigned deriv_param)
     return zeta(n+1,x);
 }
 
-const unsigned function_index_zeta2 = function::register_new("zeta", zeta2_eval, NULL, zeta2_deriv, NULL);
+const unsigned function_index_zeta2 =
+    function::register_new(function_options("zeta").
+                           eval_func(zeta2_eval).
+                          derivative_func(zeta2_deriv).
+                          overloaded(2));
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
index 97b473628464e498a233c691e2d0b724f34e7491..e15feb6d71ee2db2dafff99014327ac483fdca89 100644 (file)
@@ -726,6 +726,12 @@ matrix matrix::fraction_free_elim(const matrix & vars,
     
     matrix a(*this); // make a copy of the matrix
     matrix b(rhs);     // make a copy of the rhs vector
+
+    /*
+    cout << "before" << endl;
+    cout << "a=" << a << endl;
+    cout << "b=" << b << endl;
+    */
     
     // given an m x n matrix a, reduce it to upper echelon form
     unsigned m=a.row;
@@ -793,6 +799,12 @@ matrix matrix::fraction_free_elim(const matrix & vars,
         zero_in_last_row=zero_in_this_row;
     }
 #endif // def DO_GINAC_ASSERT
+
+    /*
+    cout << "after" << endl;
+    cout << "a=" << a << endl;
+    cout << "b=" << b << endl;
+    */
     
     // assemble solution
     matrix sol(n,1);
@@ -833,6 +845,8 @@ matrix matrix::fraction_free_elim(const matrix & vars,
         cout << vars.ffe_get(c,1) << "->" << sol.ffe_get(c,1) << endl;
     }
     */
+
+    // cout << "sol=" << sol << endl;
     
 #ifdef DO_GINAC_ASSERT
     // test solution with echelon matrix
index 90726181f8bd1c494fb233c212ff2d8d61ba4044..d7557bdc727debaca44547b7db0310d39555370b 100644 (file)
@@ -1076,7 +1076,7 @@ static ex heur_gcd(const ex &a, const ex &b, ex *ca, ex *cb, sym_desc_vec::const
             if (divide_in_z(p, g, ca ? *ca : dummy, var) && divide_in_z(q, g, cb ? *cb : dummy, var)) {
                 g *= gc;
                 ex lc = g.lcoeff(*x);
-                if (is_ex_exactly_of_type(lc, numeric) && lc.compare(_ex0()) < 0)
+                if (is_ex_exactly_of_type(lc, numeric) && ex_to_numeric(lc).is_negative())
                     return -g;
                 else
                     return g;
@@ -1442,7 +1442,8 @@ static ex frac_cancel(const ex &n, const ex &d)
        // as defined by get_first_symbol() is made positive)
        const symbol *x;
        if (get_first_symbol(den, x)) {
-               if (den.unit(*x).compare(_ex0()) < 0) {
+                GINAC_ASSERT(is_ex_exactly_of_type(den.unit(*x),numeric));
+               if (ex_to_numeric(den.unit(*x)).is_negative()) {
                        num *= _ex_1();
                        den *= _ex_1();
                }
index 21562de9ab74c3d77b90f6f8b123fe642d9a9b10..be9df1cf7ffd4532d802a54cc05bac56a4b0b003 100644 (file)
@@ -608,6 +608,16 @@ bool numeric::is_equal_same_type(const basic & other) const
     return this->is_equal(*o);
 }
 
+unsigned numeric::calchash(void) const
+{
+    return (hashvalue=cl_equal_hashcode(*value) | 0x80000000U);
+    /*
+    cout << *value << "->" << hashvalue << endl;
+    hashvalue=HASHVALUE_NUMERIC+1000U;
+    return HASHVALUE_NUMERIC+1000U;
+    */
+}
+
 /*
 unsigned numeric::calchash(void) const
 {
index 332f7552b5c3efaf779087f255230532964e5584..0d2ab166174682fc537df08430ca726077af110e 100644 (file)
@@ -138,10 +138,7 @@ 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 calchash(void) const {
-        hashvalue=HASHVALUE_NUMERIC;
-        return HASHVALUE_NUMERIC;
-    }
+    unsigned calchash(void) const;
 
     // new virtual functions which can be overridden by derived classes
     // (none)
@@ -210,9 +207,12 @@ extern const numeric I;
 extern const type_info & typeid_numeric;
 extern _numeric_digits Digits;
 
-#define is_a_numeric_hash(x) ((x)==HASHVALUE_NUMERIC)
+//#define is_a_numeric_hash(x) ((x)==HASHVALUE_NUMERIC)
 // may have to be changed to ((x)>=0x80000000U)
 
+// has been changed
+//#define is_a_numeric_hash(x) ((x)&0x80000000U)
+
 // global functions
 
 const numeric exp(const numeric & x);
index 10186fdf540c081398327259b8b0b9e4a05fe474..77e7c4d9f259946693aa7044e722af97833a7478 100644 (file)
@@ -169,7 +169,7 @@ inline simp_lor &ex_to_nonconst_simp_lor(const ex &e)
 simp_lor lor_g(const ex & mu, const ex & nu);
 simp_lor lor_vec(const string & n, const ex & mu);
 ex simplify_simp_lor_mul(const ex & m, const scalar_products & sp);
-ex simplify_simp_lor(const ex & e, const scalar_products & sp);
+ex simplify_simp_lor(const ex & e, const scalar_products & sp=scalar_products());
 ex Dim(void);
 
 #ifndef NO_NAMESPACE_GINAC
index c7ec0b2701086f08b78bf9edb83dc57d4ea17dbc..41989148a52c57e731ea77112a32cbee6be3543d 100755 (executable)
@@ -32,7 +32,7 @@ while ($decl =~ /^ ?(\w+) ([\w \,]+)\; ?((\/\*.*?\*\/)?)(.*)$/) {
         }
         $member=$2;
     }
-    if ($member !~ /^\w$/) {
+    if ($member !~ /^\w+$/) {
         die "illegal struct, must match 'struct name { type var; /*comment*/ ...};': $input_structure";
     }
     push @TYPES,$type;