lortensor class

[ginac.git] / ginac / indexed.cpp

diff --git a/ginac/indexed.cpp b/ginac/indexed.cpp
index 48a8c94801c4c7c9bc8a345b0218d57f2e1ed109..7dd2f0dae6f07c55392812634216974d0b05efa5 100644 (file)
--- a/ginac/indexed.cpp
+++ b/ginac/indexed.cpp
@@ -27,7 +27,9 @@
 #include "idx.h"
 #include "debugmsg.h"
 
 #include "idx.h"
 #include "debugmsg.h"
 

+#ifndef NO_GINAC_NAMESPACE

 namespace GiNaC {
 namespace GiNaC {

+#endif // ndef NO_GINAC_NAMESPACE

 
 //////////
 // default constructor, destructor, copy constructor assignment operator and helpers
 
 //////////
 // default constructor, destructor, copy constructor assignment operator and helpers


@@ -87,14 +89,14 @@ indexed::indexed(ex const & i1) : exprseq(i1)
 {
     debugmsg("indexed constructor from ex",LOGLEVEL_CONSTRUCT);
     tinfo_key=TINFO_indexed;
 {
     debugmsg("indexed constructor from ex",LOGLEVEL_CONSTRUCT);
     tinfo_key=TINFO_indexed;

-    ASSERT(all_of_type_idx());
+    GINAC_ASSERT(all_of_type_idx());

 }
 
 indexed::indexed(ex const & i1, ex const & i2) : exprseq(i1,i2)
 {
     debugmsg("indexed constructor from ex,ex",LOGLEVEL_CONSTRUCT);
     tinfo_key=TINFO_indexed;
 }
 
 indexed::indexed(ex const & i1, ex const & i2) : exprseq(i1,i2)
 {
     debugmsg("indexed constructor from ex,ex",LOGLEVEL_CONSTRUCT);
     tinfo_key=TINFO_indexed;

-    ASSERT(all_of_type_idx());
+    GINAC_ASSERT(all_of_type_idx());

 }
 
 indexed::indexed(ex const & i1, ex const & i2, ex const & i3)
 }
 
 indexed::indexed(ex const & i1, ex const & i2, ex const & i3)


@@ -102,21 +104,29 @@ indexed::indexed(ex const & i1, ex const & i2, ex const & i3)
 {
     debugmsg("indexed constructor from ex,ex,ex",LOGLEVEL_CONSTRUCT);
     tinfo_key=TINFO_indexed;
 {
     debugmsg("indexed constructor from ex,ex,ex",LOGLEVEL_CONSTRUCT);
     tinfo_key=TINFO_indexed;

-    ASSERT(all_of_type_idx());
+    GINAC_ASSERT(all_of_type_idx());
+}
+
+indexed::indexed(ex const & i1, ex const & i2, ex const & i3, ex const & i4)
+    : exprseq(i1,i2,i3,i4)
+{
+    debugmsg("indexed constructor from ex,ex,ex,ex",LOGLEVEL_CONSTRUCT);
+    tinfo_key=TINFO_indexed;
+    GINAC_ASSERT(all_of_type_idx());

 }
 
 indexed::indexed(exvector const & iv) : exprseq(iv)
 {
     debugmsg("indexed constructor from exvector",LOGLEVEL_CONSTRUCT);
     tinfo_key=TINFO_indexed;
 }
 
 indexed::indexed(exvector const & iv) : exprseq(iv)
 {
     debugmsg("indexed constructor from exvector",LOGLEVEL_CONSTRUCT);
     tinfo_key=TINFO_indexed;

-    ASSERT(all_of_type_idx());
+    GINAC_ASSERT(all_of_type_idx());

 }
 
 indexed::indexed(exvector * ivp) : exprseq(ivp)
 {
     debugmsg("indexed constructor from exvector *",LOGLEVEL_CONSTRUCT);
     tinfo_key=TINFO_indexed;
 }
 
 indexed::indexed(exvector * ivp) : exprseq(ivp)
 {
     debugmsg("indexed constructor from exvector *",LOGLEVEL_CONSTRUCT);
     tinfo_key=TINFO_indexed;

-    ASSERT(all_of_type_idx());
+    GINAC_ASSERT(all_of_type_idx());

 }
 
 //////////
 }
 
 //////////


@@ -188,13 +198,13 @@ exvector indexed::get_indices(void) const
 
 int indexed::compare_same_type(basic const & other) const
 {
 
 int indexed::compare_same_type(basic const & other) const
 {

-    ASSERT(is_of_type(other,indexed));
+    GINAC_ASSERT(is_of_type(other,indexed));

     return exprseq::compare_same_type(other);
 }
 
 bool indexed::is_equal_same_type(basic const & other) const
 {
     return exprseq::compare_same_type(other);
 }
 
 bool indexed::is_equal_same_type(basic const & other) const
 {

-    ASSERT(is_of_type(other,indexed));
+    GINAC_ASSERT(is_of_type(other,indexed));

     return exprseq::is_equal_same_type(other);
 }
 
     return exprseq::is_equal_same_type(other);
 }
 


@@ -292,4 +302,6 @@ bool indexed::all_of_type_idx(void) const
 const indexed some_indexed;
 type_info const & typeid_indexed=typeid(some_indexed);
 
 const indexed some_indexed;
 type_info const & typeid_indexed=typeid(some_indexed);
 

+#ifndef NO_GINAC_NAMESPACE

 } // namespace GiNaC
 } // namespace GiNaC

+#endif // ndef NO_GINAC_NAMESPACE