- Made determinant_algo (in flags.h) really work.

[ginac.git] / ginac / matrix.h

diff --git a/ginac/matrix.h b/ginac/matrix.h
index cef3dc36667b3c08d5b4c2c4a7525f5a6efcec0e..b737a38c72fec2e74b118cf57aaf285a295bb6ce 100644 (file)
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -27,11 +27,6 @@
 #include "basic.h"
 #include "ex.h"
 
 #include "basic.h"
 #include "ex.h"
 

-namespace std {
-    // forward declaration, so <stdexcept> need not be included:
-    class range_error;
-}
-

 #ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
 #endif // ndef NO_NAMESPACE_GINAC
 #ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
 #endif // ndef NO_NAMESPACE_GINAC


@@ -82,9 +77,9 @@ protected:
     
     // non-virtual functions in this class
 public:
     
     // non-virtual functions in this class
 public:

-    unsigned rows(void) const        //! get number of rows.
+    unsigned rows(void) const        //! Get number of rows.

         { return row; }
         { return row; }

-    unsigned cols(void) const        //! get number of columns.
+    unsigned cols(void) const        //! Get number of columns.

         { return col; }
     matrix add(const matrix & other) const;
     matrix sub(const matrix & other) const;
         { return col; }
     matrix add(const matrix & other) const;
     matrix sub(const matrix & other) const;


@@ -92,7 +87,7 @@ public:
     const ex & operator() (unsigned ro, unsigned co) const;
     matrix & set(unsigned ro, unsigned co, ex value);
     matrix transpose(void) const;
     const ex & operator() (unsigned ro, unsigned co) const;
     matrix & set(unsigned ro, unsigned co, ex value);
     matrix transpose(void) const;

-    ex determinant(void) const;
+    ex determinant(unsigned options = determinant_algo::automatic) const;

     ex trace(void) const;
     ex charpoly(const symbol & lambda) const;
     matrix inverse(void) const;
     ex trace(void) const;
     ex charpoly(const symbol & lambda) const;
     matrix inverse(void) const;


@@ -105,7 +100,6 @@ protected:
     int division_free_elimination(void);
     int fraction_free_elimination(bool det = false);
     int pivot(unsigned ro, bool symbolic=true);
     int division_free_elimination(void);
     int fraction_free_elimination(bool det = false);
     int pivot(unsigned ro, bool symbolic=true);

-    void swap(unsigned r1, unsigned c1, unsigned r2 ,unsigned c2);

     
 // member variables
 protected:
     
 // member variables
 protected:


@@ -147,8 +141,8 @@ inline unsigned cols(const matrix & m)
 inline matrix transpose(const matrix & m)
 { return m.transpose(); }
 
 inline matrix transpose(const matrix & m)
 { return m.transpose(); }
 

-inline ex determinant(const matrix & m)
-{ return m.determinant(); }
+inline ex determinant(const matrix & m, unsigned options = determinant_algo::automatic)
+{ return m.determinant(options); }

 
 inline ex trace(const matrix & m)
 { return m.trace(); }
 
 inline ex trace(const matrix & m)
 { return m.trace(); }