if ($#ARGV==1) {
$maxargs=$ARGV[1];
} else {
- $maxargs=15; # must be greater or equal than the value used in function.pl
+ $maxargs=16; # must be greater or equal than the value used in function.pl
}
if ($type eq 'exprseq') {
$STLHEADER="vector";
$reserve=1;
$prepend=0;
+ $sort=0;
$let_op=0;
$open_bracket='(';
$close_bracket=')';
$STLHEADER="list";
$reserve=0;
$prepend=1;
+ $sort=1;
$let_op=1;
- $open_bracket='[';
- $close_bracket=']';
+ $open_bracket='{';
+ $close_bracket='}';
} else {
die "invalid type $type";
if ($prepend) {
$PREPEND_INTERFACE=<<END_OF_PREPEND_INTERFACE;
virtual ${CONTAINER} & prepend(const ex & b);
+ virtual ${CONTAINER} & remove_first(void);
END_OF_PREPEND_INTERFACE
$PREPEND_IMPLEMENTATION=<<END_OF_PREPEND_IMPLEMENTATION;
seq.push_front(b);
return *this;
}
+
+${CONTAINER} & ${CONTAINER}::remove_first(void)
+{
+ ensure_if_modifiable();
+ seq.pop_front();
+ return *this;
+}
END_OF_PREPEND_IMPLEMENTATION
} else {
$PREPEND_INTERFACE=" // no prepend possible for ${CONTAINER}";
$PREPEND_IMPLEMENTATION="";
}
+if ($sort) {
+ $SORT_INTERFACE=<<END_OF_SORT_INTERFACE;
+ virtual ${CONTAINER} & sort(void);
+ virtual ${CONTAINER} & unique(void);
+END_OF_SORT_INTERFACE
+
+ $SORT_IMPLEMENTATION=<<END_OF_SORT_IMPLEMENTATION;
+${CONTAINER} & ${CONTAINER}::sort(void)
+{
+ ensure_if_modifiable();
+ seq.sort(ex_is_less());
+ return *this;
+}
+
+${CONTAINER} & ${CONTAINER}::unique(void)
+{
+ ensure_if_modifiable();
+ seq.unique(ex_is_equal());
+ return *this;
+}
+END_OF_SORT_IMPLEMENTATION
+} else {
+ $SORT_INTERFACE=" // no sort possible for ${CONTAINER}";
+ $SORT_IMPLEMENTATION="";
+}
+
if ($let_op) {
$LET_OP_IMPLEMENTATION=<<END_OF_LET_OP_IMPLEMENTATION
ex & ${CONTAINER}::let_op(int i)
<<'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}
}
* \$STLHEADER=${STLHEADER}
* \$reserve=${reserve}
* \$prepend=${prepend}
+ * \$sort=${sort}
* \$let_op=${let_op}
* \$open_bracket=${open_bracket}
* \$close_bracket=${close_bracket}
* \$maxargs=${maxargs}
*
- * GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2003 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
#include "basic.h"
#include "ex.h"
-#ifndef NO_NAMESPACE_GINAC
namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
-// Cint does not like ${STLHEADER}<..,default_alloc> but malloc_alloc is
-// unstandardized and not supported by newer GCCs.
-#if defined(__GNUC__) && ((__GNUC__ == 2) && (__GNUC_MINOR__ < 97))
-typedef std::${STLHEADER}<ex,malloc_alloc> ${STLT};
-#else
typedef std::${STLHEADER}<ex> ${STLT};
-#endif
class ${CONTAINER} : public basic
{
GINAC_DECLARE_REGISTERED_CLASS(${CONTAINER}, basic)
public:
- ${CONTAINER}(${STLT} const & s, bool discardable=0);
+ ${CONTAINER}(${STLT} const & s, bool discardable = false);
${CONTAINER}(${STLT} * vp); // vp will be deleted
${constructors_interface}
public:
- 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 print(const print_context & c, unsigned level = 0) const;
+ unsigned precedence(void) const {return 10;}
bool info(unsigned inf) const;
unsigned nops() const;
ex & let_op(int i);
- ex expand(unsigned options=0) const;
- bool has(const ex & other) const;
+ ex map(map_function & f) const;
ex eval(int level=0) const;
- ex evalf(int level=0) const;
- ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
- ex derivative(const symbol & s) const;
- ex subs(const lst & ls, const lst & lr) const;
+ ex subs(const lst & ls, const lst & lr, bool no_pattern = false) const;
protected:
bool is_equal_same_type(const basic & other) const;
unsigned return_type(void) const;
// new virtual functions which can be overridden by derived classes
public:
virtual ${CONTAINER} & append(const ex & b);
+ virtual ${CONTAINER} & remove_last(void);
${PREPEND_INTERFACE}
+${SORT_INTERFACE}
protected:
- virtual void printseq(std::ostream & os, char openbracket, char delim,
+ virtual void printseq(const print_context & c, char openbracket, char delim,
char closebracket, unsigned this_precedence,
- unsigned upper_precedence=0) const;
+ unsigned upper_precedence = 0) const;
virtual ex this${CONTAINER}(${STLT} const & v) const;
virtual ex this${CONTAINER}(${STLT} * vp) const;
protected:
bool is_canonical() const;
${STLT} evalchildren(int level) const;
- ${STLT} evalfchildren(int level) const;
- ${STLT} normalchildren(int level) const;
- ${STLT} diffchildren(const symbol & s) const;
- ${STLT} * subschildren(const lst & ls, const lst & lr) const;
+ ${STLT} * subschildren(const lst & ls, const lst & lr, bool no_pattern = false) const;
protected:
${STLT} seq;
- static unsigned precedence;
};
-// global constants
-
-extern const ${CONTAINER} some_${CONTAINER};
-extern const std::type_info & typeid_${CONTAINER};
-
// utility functions
-inline const ${CONTAINER} &ex_to_${CONTAINER}(const ex &e)
-{
- return static_cast<const ${CONTAINER} &>(*e.bp);
-}
-inline ${CONTAINER} &ex_to_nonconst_${CONTAINER}(const ex &e)
+/** Specialization of is_exactly_a<${CONTAINER}>(obj) for ${CONTAINER} objects. */
+template<> inline bool is_exactly_a<${CONTAINER}>(const basic & obj)
{
- return static_cast<${CONTAINER} &>(*e.bp);
+ return obj.tinfo()==TINFO_${CONTAINER};
}
-#ifndef NO_NAMESPACE_GINAC
} // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
#endif // ndef __GINAC_${CONTAINER_UC}_H__
* \$close_bracket=${close_bracket}
* \$maxargs=${maxargs}
*
- * GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2003 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
#include "${CONTAINER}.h"
#include "ex.h"
+#include "print.h"
#include "archive.h"
-#include "debugmsg.h"
-#ifndef NO_NAMESPACE_GINAC
namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
GINAC_IMPLEMENT_REGISTERED_CLASS(${CONTAINER}, basic)
${RESERVE_IMPLEMENTATION}
//////////
-// default constructor, destructor, copy constructor assignment operator and helpers
+// default ctor, dtor, copy ctor, assignment operator and helpers
//////////
// public
-${CONTAINER}::${CONTAINER}() : basic(TINFO_${CONTAINER})
-{
- debugmsg("${CONTAINER} default constructor",LOGLEVEL_CONSTRUCT);
-}
+${CONTAINER}::${CONTAINER}() : basic(TINFO_${CONTAINER}) {}
// protected
}
//////////
-// other constructors
+// other ctors
//////////
// public
${CONTAINER}::${CONTAINER}(${STLT} const & s, bool discardable) : basic(TINFO_${CONTAINER})
{
- debugmsg("${CONTAINER} constructor from ${STLT}", LOGLEVEL_CONSTRUCT);
if (discardable) {
seq.swap(const_cast<${STLT} &>(s));
} else {
${CONTAINER}::${CONTAINER}(${STLT} * vp) : basic(TINFO_${CONTAINER})
{
- debugmsg("${CONTAINER} constructor from ${STLT} *",LOGLEVEL_CONSTRUCT);
GINAC_ASSERT(vp!=0);
seq.swap(*vp);
delete vp;
/** Construct object from archive_node. */
${CONTAINER}::${CONTAINER}(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
{
- debugmsg("${CONTAINER} constructor from archive_node", LOGLEVEL_CONSTRUCT);
for (unsigned int i=0; true; i++) {
ex e;
if (n.find_ex("seq", e, sym_lst, i))
void ${CONTAINER}::archive(archive_node &n) const
{
inherited::archive(n);
- ${STLT}::const_iterator i = seq.begin(), iend = seq.end();
- while (i != iend) {
+ ${STLT}::const_iterator i = seq.begin(), end = seq.end();
+ while (i != end) {
n.add_ex("seq", *i);
- i++;
+ ++i;
}
}
//////////
-// functions overriding virtual functions from bases classes
+// functions overriding virtual functions from base classes
//////////
// public
-void ${CONTAINER}::printraw(std::ostream & os) const
+void ${CONTAINER}::print(const print_context & c, unsigned level) const
{
- debugmsg("${CONTAINER} printraw",LOGLEVEL_PRINT);
-
- os << "${CONTAINER}(";
- for (${STLT}::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) {
- (*cit).bp->printraw(os);
- os << ",";
- }
- os << ")";
-}
-
-void ${CONTAINER}::print(std::ostream & os, unsigned upper_precedence) const
-{
- debugmsg("${CONTAINER} print",LOGLEVEL_PRINT);
- // always print brackets around seq, ignore upper_precedence
- printseq(os,'${open_bracket}',',','${close_bracket}',precedence,precedence+1);
-}
+ if (is_a<print_tree>(c)) {
-void ${CONTAINER}::printtree(std::ostream & os, unsigned indent) const
-{
- debugmsg("${CONTAINER} printtree",LOGLEVEL_PRINT);
-
- os << std::string(indent,' ') << "type=" << class_name()
- << ", hash=" << hashvalue
- << " (0x" << std::hex << hashvalue << std::dec << ")"
- << ", flags=" << flags
- << ", nops=" << nops() << std::endl;
- for (${STLT}::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) {
- (*cit).printtree(os,indent+delta_indent);
+ c.s << std::string(level, ' ') << class_name()
+ << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
+ << ", nops=" << nops()
+ << std::endl;
+ unsigned delta_indent = static_cast<const print_tree &>(c).delta_indent;
+ ${STLT}::const_iterator i = seq.begin(), end = seq.end();
+ while (i != end) {
+ i->print(c, level + delta_indent);
+ ++i;
+ }
+ c.s << std::string(level + delta_indent,' ') << "=====" << std::endl;
+ } else if (is_a<print_python>(c)) {
+ printseq(c, '[', ',', ']', precedence(), precedence()+1);
+ } else if (is_a<print_python_repr>(c)) {
+ c.s << class_name ();
+ printseq(c, '(', ',', ')', precedence(), precedence()+1);
+ } else {
+ // always print brackets around seq, ignore upper_precedence
+ printseq(c, '${open_bracket}', ',', '${close_bracket}', precedence(), precedence()+1);
}
- os << std::string(indent+delta_indent,' ') << "=====" << std::endl;
}
// ${CONTAINER}::info() will be implemented by user elsewhere";
${LET_OP_IMPLEMENTATION}
-ex ${CONTAINER}::expand(unsigned options) const
+ex ${CONTAINER}::map(map_function & f) const
{
+ // This implementation is here because basic::map() uses let_op()
+ // which is not defined for all containers
${STLT} s;
RESERVE(s,seq.size());
- for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
- s.push_back((*it).expand(options));
+ ${STLT}::const_iterator i = seq.begin(), end = seq.end();
+ while (i != end) {
+ s.push_back(f(*i));
+ ++i;
}
return this${CONTAINER}(s);
}
-// a ${CONTAINER} 'has' an expression if it is this expression itself or a child 'has' it
-
-bool ${CONTAINER}::has(const ex & other) const
-{
- GINAC_ASSERT(other.bp!=0);
- if (is_equal(*other.bp)) return true;
- for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
- if ((*it).has(other)) return true;
- }
- return false;
-}
-
ex ${CONTAINER}::eval(int level) const
{
if (level==1) {
return this${CONTAINER}(evalchildren(level));
}
-ex ${CONTAINER}::evalf(int level) const
+ex ${CONTAINER}::subs(const lst & ls, const lst & lr, bool no_pattern) const
{
- return this${CONTAINER}(evalfchildren(level));
-}
-
-/** Implementation of ex::normal() for ${CONTAINER}s. It normalizes the arguments
- * and replaces the ${CONTAINER} by a temporary symbol.
- * \@see ex::normal */
-ex ${CONTAINER}::normal(lst &sym_lst, lst &repl_lst, int level) const
-{
- ex n=this${CONTAINER}(normalchildren(level));
- return n.bp->basic::normal(sym_lst,repl_lst,level);
-}
-
-ex ${CONTAINER}::derivative(const symbol & s) const
-{
- return this${CONTAINER}(diffchildren(s));
-}
-
-ex ${CONTAINER}::subs(const lst & ls, const lst & lr) const
-{
- ${STLT} * vp=subschildren(ls,lr);
- if (vp==0) {
- return *this;
- }
- return this${CONTAINER}(vp);
+ ${STLT} *vp = subschildren(ls, lr, no_pattern);
+ if (vp)
+ return ex_to<basic>(this${CONTAINER}(vp)).basic::subs(ls, lr, no_pattern);
+ else
+ return basic::subs(ls, lr, no_pattern);
}
// protected
int ${CONTAINER}::compare_same_type(const basic & other) const
{
- GINAC_ASSERT(is_of_type(other,${CONTAINER}));
- ${CONTAINER} const & o=static_cast<${CONTAINER} const &>
- (const_cast<basic &>(other));
- int cmpval;
- ${STLT}::const_iterator it1=seq.begin();
- ${STLT}::const_iterator it2=o.seq.begin();
-
- for (; (it1!=seq.end())&&(it2!=o.seq.end()); ++it1, ++it2) {
- cmpval=(*it1).compare(*it2);
- if (cmpval!=0) return cmpval;
- }
+ GINAC_ASSERT(is_a<${CONTAINER}>(other));
+ ${CONTAINER} const & o = static_cast<const ${CONTAINER} &>(other);
- if (it1==seq.end()) {
- return (it2==o.seq.end() ? 0 : -1);
+ ${STLT}::const_iterator it1 = seq.begin(), it1end = seq.end(),
+ it2 = o.seq.begin(), it2end = o.seq.end();
+
+ while (it1 != it1end && it2 != it2end) {
+ int cmpval = it1->compare(*it2);
+ if (cmpval)
+ return cmpval;
+ ++it1; ++it2;
}
- return 1;
+ return (it1 == it1end) ? (it2 == it2end ? 0 : -1) : 1;
}
bool ${CONTAINER}::is_equal_same_type(const basic & other) const
{
- GINAC_ASSERT(is_of_type(other,${CONTAINER}));
- ${CONTAINER} const & o=static_cast<${CONTAINER} const &>
- (const_cast<basic &>(other));
- if (seq.size()!=o.seq.size()) return false;
+ GINAC_ASSERT(is_a<${CONTAINER}>(other));
+ ${CONTAINER} const &o = static_cast<const ${CONTAINER} &>(other);
+
+ if (seq.size() != o.seq.size())
+ return false;
- ${STLT}::const_iterator it1=seq.begin();
- ${STLT}::const_iterator it2=o.seq.begin();
+ ${STLT}::const_iterator it1 = seq.begin(), it1end = seq.end(),
+ it2 = o.seq.begin();
- for (; it1!=seq.end(); ++it1, ++it2) {
- if (!(*it1).is_equal(*it2)) return false;
+ while (it1 != it1end) {
+ if (!it1->is_equal(*it2))
+ return false;
+ ++it1; ++it2;
}
return true;
return *this;
}
+${CONTAINER} & ${CONTAINER}::remove_last(void)
+{
+ ensure_if_modifiable();
+ seq.pop_back();
+ return *this;
+}
+
${PREPEND_IMPLEMENTATION}
+${SORT_IMPLEMENTATION}
+
// protected
-void ${CONTAINER}::printseq(std::ostream & os, char openbracket, char delim,
+void ${CONTAINER}::printseq(const print_context & c, char openbracket, char delim,
char closebracket, unsigned this_precedence,
unsigned upper_precedence) const
{
- if (this_precedence<=upper_precedence) os << openbracket;
- if (seq.size()!=0) {
- ${STLT}::const_iterator it,it_last;
- it=seq.begin();
- it_last=seq.end();
- --it_last;
- for (; it!=it_last; ++it) {
- (*it).bp->print(os,this_precedence);
- os << delim;
+ if (this_precedence <= upper_precedence)
+ c.s << openbracket;
+
+ if (!seq.empty()) {
+ ${STLT}::const_iterator it = seq.begin(), itend = seq.end();
+ --itend;
+ while (it != itend) {
+ it->print(c, this_precedence);
+ c.s << delim;
+ ++it;
}
- (*it).bp->print(os,this_precedence);
+ it->print(c, this_precedence);
}
- if (this_precedence<=upper_precedence) os << closebracket;
+
+ if (this_precedence <= upper_precedence)
+ c.s << closebracket;
}
ex ${CONTAINER}::this${CONTAINER}(${STLT} const & v) const
{
if (seq.size()<=1) { return 1; }
- ${STLT}::const_iterator it=seq.begin();
+ ${STLT}::const_iterator it = seq.begin(), itend = seq.end();
${STLT}::const_iterator it_last=it;
- for (++it; it!=seq.end(); it_last=it, ++it) {
- if ((*it_last).compare(*it)>0) {
- if ((*it_last).compare(*it)>0) {
+ for (++it; it!=itend; it_last=it, ++it) {
+ if (it_last->compare(*it)>0) {
+ if (it_last->compare(*it)>0) {
std::cout << *it_last << ">" << *it << "\\n";
return 0;
}
throw(std::runtime_error("max recursion level reached"));
}
--level;
- for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
- s.push_back((*it).eval(level));
- }
- return s;
-}
-
-${STLT} ${CONTAINER}::evalfchildren(int level) const
-{
- ${STLT} s;
- RESERVE(s,seq.size());
-
- if (level==1) {
- return seq;
- }
- if (level == -max_recursion_level) {
- throw(std::runtime_error("max recursion level reached"));
- }
- --level;
- for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
- s.push_back((*it).evalf(level));
- }
- return s;
-}
-
-${STLT} ${CONTAINER}::normalchildren(int level) const
-{
- ${STLT} s;
- RESERVE(s,seq.size());
-
- if (level==1) {
- return seq;
- }
- if (level == -max_recursion_level) {
- throw(std::runtime_error("max recursion level reached"));
- }
- --level;
- for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
- s.push_back((*it).normal(level));
- }
- return s;
-}
-
-${STLT} ${CONTAINER}::diffchildren(const symbol & y) const
-{
- ${STLT} s;
- RESERVE(s,seq.size());
- for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
- s.push_back((*it).diff(y));
- }
- return s;
-}
-
-/* obsolete subschildren
-${STLT} ${CONTAINER}::subschildren(const lst & ls, const lst & lr) const
-{
- ${STLT} s;
- RESERVE(s,seq.size());
- for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
- s.push_back((*it).subs(ls,lr));
+ ${STLT}::const_iterator it = seq.begin(), itend = seq.end();
+ while (it != itend) {
+ s.push_back(it->eval(level));
+ ++it;
}
return s;
}
-*/
-${STLT} * ${CONTAINER}::subschildren(const lst & ls, const lst & lr) const
+${STLT} * ${CONTAINER}::subschildren(const lst & ls, const lst & lr, bool no_pattern) const
{
// returns a NULL pointer if nothing had to be substituted
// returns a pointer to a newly created epvector otherwise
// (which has to be deleted somewhere else)
- ${STLT}::const_iterator last=seq.end();
- ${STLT}::const_iterator cit=seq.begin();
- while (cit!=last) {
- const ex & subsed_ex=(*cit).subs(ls,lr);
- if (!are_ex_trivially_equal(*cit,subsed_ex)) {
+ ${STLT}::const_iterator cit = seq.begin(), end = seq.end();
+ while (cit != end) {
+ const ex & subsed_ex = cit->subs(ls, lr, no_pattern);
+ if (!are_ex_trivially_equal(*cit, subsed_ex)) {
// something changed, copy seq, subs and return it
${STLT} *s=new ${STLT};
- RESERVE(*s,seq.size());
+ RESERVE(*s, seq.size());
// copy parts of seq which are known not to have changed
- ${STLT}::const_iterator cit2=seq.begin();
- while (cit2!=cit) {
+ ${STLT}::const_iterator cit2 = seq.begin();
+ while (cit2 != cit) {
s->push_back(*cit2);
++cit2;
}
+
// copy first changed element
s->push_back(subsed_ex);
++cit2;
+
// copy rest
- while (cit2!=last) {
- s->push_back((*cit2).subs(ls,lr));
+ while (cit2 != end) {
+ s->push_back(cit2->subs(ls, lr, no_pattern));
++cit2;
}
return s;
return 0; // nothing has changed
}
-//////////
-// static member variables
-//////////
-
-// protected
-
-unsigned ${CONTAINER}::precedence=10;
-
-//////////
-// global constants
-//////////
-
-const ${CONTAINER} some_${CONTAINER};
-const std::type_info & typeid_${CONTAINER} = typeid(some_${CONTAINER});
-
-#ifndef NO_NAMESPACE_GINAC
} // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
END_OF_IMPLEMENTATION
git://www.ginac.de / ginac.git / blobdiff