#include "power.h"
#include "relational.h"
#include "debugmsg.h"
+#include "utils.h"
+#ifndef NO_GINAC_NAMESPACE
namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
// binary arithmetic operators ex with ex
ex operator-(ex const & lh, ex const & rh)
{
debugmsg("operator-(ex,ex)",LOGLEVEL_OPERATOR);
- return lh.exadd(rh.exmul(exMINUSONE()));
+ return lh.exadd(rh.exmul(_ex_1()));
}
ex operator*(ex const & lh, ex const & rh)
ex operator/(ex const & lh, ex const & rh)
{
debugmsg("operator*(ex,ex)",LOGLEVEL_OPERATOR);
- return lh.exmul(power(rh,exMINUSONE()));
+ return lh.exmul(power(rh,_ex_1()));
}
ex operator%(ex const & lh, ex const & rh)
return lh.exncmul(rh);
}
-/*
-
-// binary arithmetic operators ex with numeric
-
-ex operator+(ex const & lh, numeric const & rh)
-{
- debugmsg("operator+(ex,numeric)",LOGLEVEL_OPERATOR);
- return lh+ex(rh);
-}
-
-ex operator-(ex const & lh, numeric const & rh)
-{
- debugmsg("operator-(ex,numeric)",LOGLEVEL_OPERATOR);
- return lh-ex(rh);
-}
-
-ex operator*(ex const & lh, numeric const & rh)
-{
- debugmsg("operator*(ex,numeric)",LOGLEVEL_OPERATOR);
- return lh*ex(rh);
-}
-
-ex operator/(ex const & lh, numeric const & rh)
-{
- debugmsg("operator/(ex,numeric)",LOGLEVEL_OPERATOR);
- return lh/ex(rh);
-}
-
-ex operator%(ex const & lh, numeric const & rh)
-{
- debugmsg("operator%(ex,numeric)",LOGLEVEL_OPERATOR);
- return lh%ex(rh);
-}
-
-// binary arithmetic operators numeric with ex
-
-ex operator+(numeric const & lh, ex const & rh)
-{
- debugmsg("operator+(numeric,ex)",LOGLEVEL_OPERATOR);
- return ex(lh)+rh;
-}
-
-ex operator-(numeric const & lh, ex const & rh)
-{
- debugmsg("operator-(numeric,ex)",LOGLEVEL_OPERATOR);
- return ex(lh)-rh;
-}
-
-ex operator*(numeric const & lh, ex const & rh)
-{
- debugmsg("operator*(numeric,ex)",LOGLEVEL_OPERATOR);
- return ex(lh)*rh;
-}
-
-ex operator/(numeric const & lh, ex const & rh)
-{
- debugmsg("operator/(numeric,ex)",LOGLEVEL_OPERATOR);
- return ex(lh)/rh;
-}
-
-ex operator%(numeric const & lh, ex const & rh)
-{
- debugmsg("operator%(numeric,ex)",LOGLEVEL_OPERATOR);
- return ex(lh)%rh;
-}
-
-*/
// binary arithmetic operators numeric with numeric
return lh.div(rh);
}
+
// binary arithmetic assignment operators with ex
ex const & operator+=(ex & lh, ex const & rh)
return (lh=lh%rh);
}
-/*
-
-// binary arithmetic assignment operators with numeric
-
-ex const & operator+=(ex & lh, numeric const & rh)
-{
- debugmsg("operator+=(ex,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh+ex(rh));
-}
-
-ex const & operator-=(ex & lh, numeric const & rh)
-{
- debugmsg("operator-=(ex,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh-ex(rh));
-}
-
-ex const & operator*=(ex & lh, numeric const & rh)
-{
- debugmsg("operator*=(ex,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh*ex(rh));
-}
-
-ex const & operator/=(ex & lh, numeric const & rh)
-{
- debugmsg("operator/=(ex,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh/ex(rh));
-}
-
-ex const & operator%=(ex & lh, numeric const & rh)
-{
- debugmsg("operator%=(ex,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh%ex(rh));
-}
-
-*/
// binary arithmetic assignment operators with numeric
ex operator-(ex const & lh)
{
- return exMINUSONE()*lh;
+ return lh.exmul(_ex_1());
}
numeric operator+(numeric const & lh)
numeric operator-(numeric const & lh)
{
- return numMINUSONE()*lh;
+ return _num_1()*lh;
}
/** Numeric prefix increment. Adds 1 and returns incremented number. */
numeric& operator++(numeric & rh)
{
- rh = rh+numONE();
+ rh = rh+_num1();
return rh;
}
/** Numeric prefix decrement. Subtracts 1 and returns decremented number. */
numeric& operator--(numeric & rh)
{
- rh = rh-numONE();
+ rh = rh-_num1();
return rh;
}
numeric operator++(numeric & lh, int)
{
numeric tmp = lh;
- lh = lh+numONE();
+ lh = lh+_num1();
return tmp;
}
numeric operator--(numeric & lh, int)
{
numeric tmp = lh;
- lh = lh-numONE();
+ lh = lh-_num1();
return tmp;
}
throw(std::logic_error("input from streams not yet implemented"));
}
+#ifndef NO_GINAC_NAMESPACE
} // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE