#include "basic.h"
#include "ex.h"
-#ifndef NO_NAMESPACE_GINAC
namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
/** Symbolic matrices. */
class matrix : public basic
{
GINAC_DECLARE_REGISTERED_CLASS(matrix, basic)
-
- // other constructors
+
+ // other ctors
public:
matrix(unsigned r, unsigned c);
matrix(unsigned r, unsigned c, const exvector & m2);
-
+
// functions overriding virtual functions from bases classes
public:
void print(std::ostream & os, unsigned upper_precedence=0) const;
bool has(const ex & other) const;
ex eval(int level=0) const;
ex evalf(int level=0) const;
- // ex subs(const lst & ls, const lst & lr) const;
+ ex subs(const lst & ls, const lst & lr) const;
+ ex eval_indexed(const basic & i) const;
+ ex add_indexed(const ex & self, const ex & other) const;
+ bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const;
protected:
unsigned return_type(void) const { return return_types::noncommutative; };
// new virtual functions which can be overridden by derived classes
// 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; }
- 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;
// member variables
protected:
- unsigned row; /**< number of rows */
- unsigned col; /**< number of columns */
- exvector m; /**< representation (cols indexed first) */
+ unsigned row; ///< number of rows
+ unsigned col; ///< number of columns
+ exvector m; ///< representation (cols indexed first)
static unsigned precedence;
};
extern ex lst_to_matrix(const ex &l);
-#ifndef NO_NAMESPACE_GINAC
} // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
#endif // ndef __GINAC_MATRIX_H__