* Interface to GiNaC's light-weight expression handles. */
/*
- * GiNaC Copyright (C) 1999-2015 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2016 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 <functional>
#include <iosfwd>
#include <iterator>
+#include <memory>
#include <stack>
namespace GiNaC {
const_postorder_iterator postorder_end() const noexcept;
// evaluation
- ex eval(int level = 0) const { return bp->eval(level); }
- ex evalf(int level = 0) const { return bp->evalf(level); }
+ ex eval() const { return bp->eval(); }
+ ex evalf() const { return bp->evalf(); }
ex evalm() const { return bp->evalm(); }
ex eval_ncmul(const exvector & v) const { return bp->eval_ncmul(v); }
ex eval_integ() const { return bp->eval_integ(); }
ex series(const ex & r, int order, unsigned options = 0) const;
// rational functions
- ex normal(int level = 0) const;
+ ex normal() const;
ex to_rational(exmap & repl) const;
ex to_rational(lst & repl_lst) const;
ex to_polynomial(exmap & repl) const;
}
private:
- std::stack<internal::_iter_rep, std::vector<internal::_iter_rep> > s;
+ std::stack<internal::_iter_rep, std::vector<internal::_iter_rep>> s;
void increment()
{
}
private:
- std::stack<internal::_iter_rep, std::vector<internal::_iter_rep> > s;
+ std::stack<internal::_iter_rep, std::vector<internal::_iter_rep>> s;
void descend()
{
}
/* Function objects for STL sort() etc. */
-struct ex_is_less : public std::binary_function<ex, ex, bool> {
+struct ex_is_less {
bool operator() (const ex &lh, const ex &rh) const { return lh.compare(rh) < 0; }
};
-struct ex_is_equal : public std::binary_function<ex, ex, bool> {
+struct ex_is_equal {
bool operator() (const ex &lh, const ex &rh) const { return lh.is_equal(rh); }
};
-struct op0_is_equal : public std::binary_function<ex, ex, bool> {
+struct op0_is_equal {
bool operator() (const ex &lh, const ex &rh) const { return lh.op(0).is_equal(rh.op(0)); }
};
-struct ex_swap : public std::binary_function<ex, ex, void> {
+struct ex_swap {
void operator() (ex &lh, ex &rh) const { lh.swap(rh); }
};
inline ex numer_denom(const ex & thisex)
{ return thisex.numer_denom(); }
-inline ex normal(const ex & thisex, int level=0)
-{ return thisex.normal(level); }
+inline ex normal(const ex & thisex)
+{ return thisex.normal(); }
inline ex to_rational(const ex & thisex, lst & repl_lst)
{ return thisex.to_rational(repl_lst); }
inline ex collect(const ex & thisex, const ex & s, bool distributed = false)
{ return thisex.collect(s, distributed); }
-inline ex eval(const ex & thisex, int level = 0)
-{ return thisex.eval(level); }
+inline ex eval(const ex & thisex)
+{ return thisex.eval(); }
-inline ex evalf(const ex & thisex, int level = 0)
-{ return thisex.evalf(level); }
+inline ex evalf(const ex & thisex)
+{ return thisex.evalf(); }
inline ex evalm(const ex & thisex)
{ return thisex.evalm(); }
ex (*ptr)(const ex &);
public:
explicit pointer_to_map_function(ex x(const ex &)) : ptr(x) {}
- ex operator()(const ex & e) { return ptr(e); }
+ ex operator()(const ex & e) override { return ptr(e); }
};
template<class T1>
T1 arg1;
public:
explicit pointer_to_map_function_1arg(ex x(const ex &, T1), T1 a1) : ptr(x), arg1(a1) {}
- ex operator()(const ex & e) { return ptr(e, arg1); }
+ ex operator()(const ex & e) override { return ptr(e, arg1); }
};
template<class T1, class T2>
T2 arg2;
public:
explicit pointer_to_map_function_2args(ex x(const ex &, T1, T2), T1 a1, T2 a2) : ptr(x), arg1(a1), arg2(a2) {}
- ex operator()(const ex & e) { return ptr(e, arg1, arg2); }
+ ex operator()(const ex & e) override { return ptr(e, arg1, arg2); }
};
template<class T1, class T2, class T3>
T3 arg3;
public:
explicit pointer_to_map_function_3args(ex x(const ex &, T1, T2, T3), T1 a1, T2 a2, T3 a3) : ptr(x), arg1(a1), arg2(a2), arg3(a3) {}
- ex operator()(const ex & e) { return ptr(e, arg1, arg2, arg3); }
+ ex operator()(const ex & e) override { return ptr(e, arg1, arg2, arg3); }
};
template<class C>
C &c;
public:
explicit pointer_to_member_to_map_function(ex (C::*member)(const ex &), C &obj) : ptr(member), c(obj) {}
- ex operator()(const ex & e) { return (c.*ptr)(e); }
+ ex operator()(const ex & e) override { return (c.*ptr)(e); }
};
template<class C, class T1>
T1 arg1;
public:
explicit pointer_to_member_to_map_function_1arg(ex (C::*member)(const ex &, T1), C &obj, T1 a1) : ptr(member), c(obj), arg1(a1) {}
- ex operator()(const ex & e) { return (c.*ptr)(e, arg1); }
+ ex operator()(const ex & e) override { return (c.*ptr)(e, arg1); }
};
template<class C, class T1, class T2>
T2 arg2;
public:
explicit pointer_to_member_to_map_function_2args(ex (C::*member)(const ex&, T1, T2), C &obj, T1 a1, T2 a2) : ptr(member), c(obj), arg1(a1), arg2(a2) {}
- ex operator()(const ex & e) { return (c.*ptr)(e, arg1, arg2); }
+ ex operator()(const ex & e) override { return (c.*ptr)(e, arg1, arg2); }
};
template<class C, class T1, class T2, class T3>
T3 arg3;
public:
explicit pointer_to_member_to_map_function_3args(ex (C::*member)(const ex &, T1, T2, T3), C &obj, T1 a1, T2 a2, T3 a3) : ptr(member), c(obj), arg1(a1), arg2(a2), arg3(a3) {}
- ex operator()(const ex & e) { return (c.*ptr)(e, arg1, arg2, arg3); }
+ ex operator()(const ex & e) override { return (c.*ptr)(e, arg1, arg2, arg3); }
};
inline ex ex::map(ex f(const ex &)) const
a.swap(b);
}
-/** Specialization of std::iter_swap() for vector<ex> iterators. */
-template <>
-inline void iter_swap(vector<GiNaC::ex>::iterator i1, vector<GiNaC::ex>::iterator i2)
-{
- i1->swap(*i2);
-}
-
-/** Specialization of std::iter_swap() for list<ex> iterators. */
-template <>
-inline void iter_swap(list<GiNaC::ex>::iterator i1, list<GiNaC::ex>::iterator i2)
-{
- i1->swap(*i2);
-}
-
} // namespace std
#endif // ndef GINAC_EX_H