simplified_ncmul() -> hold_ncmul()

nonsimplified_ncmul() -> reeval_ncmul()

diff --git a/ginac/basic.cpp b/ginac/basic.cpp
index d2b624a65e6c7cd9b405f66d4e15cbe1b4ba3225..a79ac0652d50a7d5cb364448c0d761671ac91883 100644 (file)
--- a/ginac/basic.cpp
+++ b/ginac/basic.cpp
@@ -576,7 +576,7 @@ exvector basic::get_free_indices(void) const
 
 ex basic::eval_ncmul(const exvector & v) const
 {
-       return simplified_ncmul(v);
+       return hold_ncmul(v);
 }
 
 // protected

diff --git a/ginac/clifford.cpp b/ginac/clifford.cpp
index 9a1330e433ebd02cc88193e6d55121784050cf19..1ab5eef55485fa0e8613564cfe2c55dbb7fbe87c 100644 (file)
--- a/ginac/clifford.cpp
+++ b/ginac/clifford.cpp
@@ -454,9 +454,9 @@ ex clifford::eval_ncmul(const exvector & v) const
        if (s.empty())
                return clifford(diracone(), representation_label) * sign;
        if (something_changed)
-               return nonsimplified_ncmul(s) * sign;
+               return reeval_ncmul(s) * sign;
        else
-               return simplified_ncmul(s) * sign;
+               return hold_ncmul(s) * sign;
 }
 
 ex clifford::thisexprseq(const exvector & v) const

diff --git a/ginac/color.cpp b/ginac/color.cpp
index 94f1871b5b44a415ef7903c76fb29b80caead759..9600065d58532bd596573f234cb18fde7759e92b 100644 (file)
--- a/ginac/color.cpp
+++ b/ginac/color.cpp
@@ -171,7 +171,7 @@ ex color::eval_ncmul(const exvector & v) const
        if (s.empty())
                return color(su3one(), representation_label);
        else
-               return simplified_ncmul(s);
+               return hold_ncmul(s);
 }
 
 ex color::thisexprseq(const exvector & v) const

diff --git a/ginac/ncmul.cpp b/ginac/ncmul.cpp
index dc328818eca7aa1f16a86e9fd8c2fb2e87225a55..b0fbb93d722ff7afe75d6ea943dcdbfe3a2c6963 100644 (file)
--- a/ginac/ncmul.cpp
+++ b/ginac/ncmul.cpp
@@ -574,12 +574,12 @@ const exvector & ncmul::get_factors(void) const
 // friend functions
 //////////
 
-ex nonsimplified_ncmul(const exvector & v)
+ex reeval_ncmul(const exvector & v)
 {
        return (new ncmul(v))->setflag(status_flags::dynallocated);
 }
 
-ex simplified_ncmul(const exvector & v)
+ex hold_ncmul(const exvector & v)
 {
        if (v.empty())
                return _ex1;

diff --git a/ginac/ncmul.h b/ginac/ncmul.h
index b2ea9ca211da96a41c1d5d31f49b6d349fcf1a6e..3db9d17821ee2784376f060bee688cc133f6e640 100644 (file)
--- a/ginac/ncmul.h
+++ b/ginac/ncmul.h
@@ -33,8 +33,8 @@ class ncmul : public exprseq
        GINAC_DECLARE_REGISTERED_CLASS(ncmul, exprseq)
 
        friend class power;
-       friend ex nonsimplified_ncmul(const exvector & v);
-       friend ex simplified_ncmul(const exvector & v);
+       friend ex reeval_ncmul(const exvector & v);
+       friend ex hold_ncmul(const exvector & v);
 
 // member functions
 
@@ -84,8 +84,8 @@ public:
 
 // friend funtions 
 
-ex nonsimplified_ncmul(const exvector & v);
-ex simplified_ncmul(const exvector & v);
+ex reeval_ncmul(const exvector & v);
+ex hold_ncmul(const exvector & v);
 
 // utility functions