- Banned exZERO(), exONE(), exMINUSHALF() and all this from the interface.

[ginac.git] / ginac / matrix.cpp

diff --git a/ginac/matrix.cpp b/ginac/matrix.cpp
index a4db03dd9746ee80164769ac970590354e4cb0e2..eddc62052c1a4c7d2c5dc235147d5fcb1f098bf7 100644 (file)
--- a/ginac/matrix.cpp
+++ b/ginac/matrix.cpp
@@ -25,6 +25,7 @@
 
 #include "matrix.h"
 #include "debugmsg.h"
 
 #include "matrix.h"
 #include "debugmsg.h"

+#include "utils.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {


@@ -42,7 +43,7 @@ matrix::matrix()
     : basic(TINFO_matrix), row(1), col(1)
 {
     debugmsg("matrix default constructor",LOGLEVEL_CONSTRUCT);
     : basic(TINFO_matrix), row(1), col(1)
 {
     debugmsg("matrix default constructor",LOGLEVEL_CONSTRUCT);

-    m.push_back(exZERO());
+    m.push_back(_ex0());

 }
 
 matrix::~matrix()
 }
 
 matrix::~matrix()


@@ -95,16 +96,16 @@ matrix::matrix(int r, int c)
     : basic(TINFO_matrix), row(r), col(c)
 {
     debugmsg("matrix constructor from int,int",LOGLEVEL_CONSTRUCT);
     : basic(TINFO_matrix), row(r), col(c)
 {
     debugmsg("matrix constructor from int,int",LOGLEVEL_CONSTRUCT);

-    m.resize(r*c, exZERO());
+    m.resize(r*c, _ex0());

 }
 
 // protected
 
 /** Ctor from representation, for internal use only. */
 }
 
 // protected
 
 /** Ctor from representation, for internal use only. */

-matrix::matrix(int r, int c, vector<ex> const & m2)
+matrix::matrix(int r, int c, exvector const & m2)

     : basic(TINFO_matrix), row(r), col(c), m(m2)
 {
     : basic(TINFO_matrix), row(r), col(c), m(m2)
 {

-    debugmsg("matrix constructor from int,int,vector<ex>",LOGLEVEL_CONSTRUCT);
+    debugmsg("matrix constructor from int,int,exvector",LOGLEVEL_CONSTRUCT);

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


@@ -170,7 +171,7 @@ ex & matrix::let_op(int const i)
 /** expands the elements of a matrix entry by entry. */
 ex matrix::expand(unsigned options) const
 {
 /** expands the elements of a matrix entry by entry. */
 ex matrix::expand(unsigned options) const
 {

-    vector<ex> tmp(row*col);
+    exvector tmp(row*col);

     for (int i=0; i<row*col; ++i) {
         tmp[i]=m[i].expand(options);
     }
     for (int i=0; i<row*col; ++i) {
         tmp[i]=m[i].expand(options);
     }


@@ -187,7 +188,7 @@ bool matrix::has(ex const & other) const
     if (is_equal(*other.bp)) return true;
     
     // search all the elements
     if (is_equal(*other.bp)) return true;
     
     // search all the elements

-    for (vector<ex>::const_iterator r=m.begin(); r!=m.end(); ++r) {
+    for (exvector::const_iterator r=m.begin(); r!=m.end(); ++r) {

         if ((*r).has(other)) return true;
     }
     return false;
         if ((*r).has(other)) return true;
     }
     return false;


@@ -209,7 +210,7 @@ ex matrix::eval(int level) const
     }
     
     // eval() entry by entry
     }
     
     // eval() entry by entry

-    vector<ex> m2(row*col);
+    exvector m2(row*col);

     --level;    
     for (int r=0; r<row; ++r) {
         for (int c=0; c<col; ++c) {
     --level;    
     for (int r=0; r<row; ++r) {
         for (int c=0; c<col; ++c) {


@@ -237,7 +238,7 @@ ex matrix::evalf(int level) const
     }
     
     // evalf() entry by entry
     }
     
     // evalf() entry by entry

-    vector<ex> m2(row*col);
+    exvector m2(row*col);

     --level;
     for (int r=0; r<row; ++r) {
         for (int c=0; c<col; ++c) {
     --level;
     for (int r=0; r<row; ++r) {
         for (int c=0; c<col; ++c) {


@@ -291,9 +292,9 @@ matrix matrix::add(matrix const & other) const
         throw (std::logic_error("matrix::add(): incompatible matrices"));
     }
     
         throw (std::logic_error("matrix::add(): incompatible matrices"));
     }
     

-    vector<ex> sum(this->m);
-    vector<ex>::iterator i;
-    vector<ex>::const_iterator ci;
+    exvector sum(this->m);
+    exvector::iterator i;
+    exvector::const_iterator ci;

     for (i=sum.begin(), ci=other.m.begin();
          i!=sum.end();
          ++i, ++ci) {
     for (i=sum.begin(), ci=other.m.begin();
          i!=sum.end();
          ++i, ++ci) {


@@ -311,9 +312,9 @@ matrix matrix::sub(matrix const & other) const
         throw (std::logic_error("matrix::sub(): incompatible matrices"));
     }
     
         throw (std::logic_error("matrix::sub(): incompatible matrices"));
     }
     

-    vector<ex> dif(this->m);
-    vector<ex>::iterator i;
-    vector<ex>::const_iterator ci;
+    exvector dif(this->m);
+    exvector::iterator i;
+    exvector::const_iterator ci;

     for (i=dif.begin(), ci=other.m.begin();
          i!=dif.end();
          ++i, ++ci) {
     for (i=dif.begin(), ci=other.m.begin();
          i!=dif.end();
          ++i, ++ci) {


@@ -331,7 +332,7 @@ matrix matrix::mul(matrix const & other) const
         throw (std::logic_error("matrix::mul(): incompatible matrices"));
     }
     
         throw (std::logic_error("matrix::mul(): incompatible matrices"));
     }
     

-    vector<ex> prod(row*other.col);
+    exvector prod(row*other.col);

     for (int i=0; i<row; ++i) {
         for (int j=0; j<other.col; ++j) {
             for (int l=0; l<col; ++l) {
     for (int i=0; i<row; ++i) {
         for (int j=0; j<other.col; ++j) {
             for (int l=0; l<col; ++l) {


@@ -374,7 +375,7 @@ matrix & matrix::set(int ro, int co, ex value)
  *  represents the transposed. */
 matrix matrix::transpose(void) const
 {
  *  represents the transposed. */
 matrix matrix::transpose(void) const
 {

-    vector<ex> trans(col*row);
+    exvector trans(col*row);

     
     for (int r=0; r<col; ++r) {
         for (int c=0; c<row; ++c) {
     
     for (int r=0; r<col; ++r) {
         for (int c=0; c<row; ++c) {


@@ -390,16 +391,16 @@ ex determinant_numeric(const matrix & M)
 {
     GINAC_ASSERT(M.rows()==M.cols());  // cannot happen, just in case...
     matrix tmp(M);
 {
     GINAC_ASSERT(M.rows()==M.cols());  // cannot happen, just in case...
     matrix tmp(M);

-    ex det=exONE();
+    ex det=_ex1();

     ex piv;
     
     for (int r1=0; r1<M.rows(); ++r1) {
         int indx = tmp.pivot(r1);
         if (indx == -1) {
     ex piv;
     
     for (int r1=0; r1<M.rows(); ++r1) {
         int indx = tmp.pivot(r1);
         if (indx == -1) {

-            return exZERO();
+            return _ex0();

         }
         if (indx != 0) {
         }
         if (indx != 0) {

-            det *= exMINUSONE();
+            det *= _ex_1();

         }
         det = det * tmp.m[r1*M.cols()+r1];
         for (int r2=r1+1; r2<M.rows(); ++r2) {
         }
         det = det * tmp.m[r1*M.cols()+r1];
         for (int r2=r1+1; r2<M.rows(); ++r2) {


@@ -544,7 +545,7 @@ ex matrix::determinant(bool normalized) const
     }
 
     // check, if there are non-numeric entries in the matrix:
     }
 
     // check, if there are non-numeric entries in the matrix:

-    for (vector<ex>::const_iterator r=m.begin(); r!=m.end(); ++r) {
+    for (exvector::const_iterator r=m.begin(); r!=m.end(); ++r) {

         if (!(*r).info(info_flags::numeric)) {
             if (normalized) {
                 return determinant_symbolic_minor(*this).normal();
         if (!(*r).info(info_flags::numeric)) {
             if (normalized) {
                 return determinant_symbolic_minor(*this).normal();


@@ -609,7 +610,7 @@ matrix matrix::inverse(void) const
     matrix tmp(row,col);
     // set tmp to the unit matrix
     for (int i=0; i<col; ++i) {
     matrix tmp(row,col);
     // set tmp to the unit matrix
     for (int i=0; i<col; ++i) {

-        tmp.m[i*col+i] = exONE();
+        tmp.m[i*col+i] = _ex1();

     }
     // create a copy of this matrix
     matrix cpy(*this);
     }
     // create a copy of this matrix
     matrix cpy(*this);


@@ -689,7 +690,7 @@ matrix matrix::fraction_free_elim(matrix const & vars,
     for (int k=1; (k<=n)&&(r<=m); ++k) {
         // find a nonzero pivot
         int p;
     for (int k=1; (k<=n)&&(r<=m); ++k) {
         // find a nonzero pivot
         int p;

-        for (p=r; (p<=m)&&(a.ffe_get(p,k).is_equal(exZERO())); ++p) {}
+        for (p=r; (p<=m)&&(a.ffe_get(p,k).is_equal(_ex0())); ++p) {}

         // pivot is in row p
         if (p<=m) {
             if (p!=r) {
         // pivot is in row p
         if (p<=m) {
             if (p!=r) {


@@ -734,7 +735,7 @@ matrix matrix::fraction_free_elim(matrix const & vars,
     for (int r=1; r<=m; ++r) {
         int zero_in_this_row=0;
         for (int c=1; c<=n; ++c) {
     for (int r=1; r<=m; ++r) {
         int zero_in_this_row=0;
         for (int c=1; c<=n; ++c) {

-            if (a.ffe_get(r,c).is_equal(exZERO())) {
+            if (a.ffe_get(r,c).is_equal(_ex0())) {

                zero_in_this_row++;
             } else {
                 break;
                zero_in_this_row++;
             } else {
                 break;


@@ -861,7 +862,7 @@ matrix matrix::solve(matrix const & v) const
     }
     
     // assemble the solution matrix
     }
     
     // assemble the solution matrix

-    vector<ex> sol(v.row*v.col);
+    exvector sol(v.row*v.col);

     for (int c=0; c<v.col; ++c) {
         for (int r=col-1; r>=0; --r) {
             sol[r*v.col+c] = tmp[r*tmp.col+c];
     for (int c=0; c<v.col; ++c) {
         for (int r=col-1; r>=0; --r) {
             sol[r*v.col+c] = tmp[r*tmp.col+c];