#include <iostream>
#include <stdexcept>
-#include "ginac.h"
+#include "add.h"
+#include "mul.h"
//////////
// default constructor, destructor, copy constructor assignment operator and helpers
add::add()
{
debugmsg("add default constructor",LOGLEVEL_CONSTRUCT);
- tinfo_key = TINFO_ADD;
+ tinfo_key = TINFO_add;
}
add::~add()
add::add(ex const & lh, ex const & rh)
{
debugmsg("add constructor from ex,ex",LOGLEVEL_CONSTRUCT);
- tinfo_key = TINFO_ADD;
+ tinfo_key = TINFO_add;
overall_coeff=exZERO();
construct_from_2_ex(lh,rh);
ASSERT(is_canonical());
add::add(exvector const & v)
{
debugmsg("add constructor from exvector",LOGLEVEL_CONSTRUCT);
- tinfo_key = TINFO_ADD;
+ tinfo_key = TINFO_add;
overall_coeff=exZERO();
construct_from_exvector(v);
ASSERT(is_canonical());
add::add(epvector const & v, bool do_not_canonicalize)
{
debugmsg("add constructor from epvector,bool",LOGLEVEL_CONSTRUCT);
- tinfo_key = TINFO_ADD;
+ tinfo_key = TINFO_add;
if (do_not_canonicalize) {
seq=v;
#ifdef EXPAIRSEQ_USE_HASHTAB
add::add(epvector const & v)
{
debugmsg("add constructor from epvector",LOGLEVEL_CONSTRUCT);
- tinfo_key = TINFO_ADD;
+ tinfo_key = TINFO_add;
overall_coeff=exZERO();
construct_from_epvector(v);
ASSERT(is_canonical());
add::add(epvector const & v, ex const & oc)
{
debugmsg("add constructor from epvector,ex",LOGLEVEL_CONSTRUCT);
- tinfo_key = TINFO_ADD;
+ tinfo_key = TINFO_add;
overall_coeff=oc;
construct_from_epvector(v);
ASSERT(is_canonical());
add::add(epvector * vp, ex const & oc)
{
debugmsg("add constructor from epvector *,ex",LOGLEVEL_CONSTRUCT);
- tinfo_key = TINFO_ADD;
+ tinfo_key = TINFO_add;
ASSERT(vp!=0);
overall_coeff=oc;
construct_from_epvector(*vp);