#include <base/config.h>
#include <base/exceptions.h>
-#include <base/vector2d.h>
+#include <base/table.h>
#include <vector>
* @author Guido Kanschat, Franz-Theo Suttmeier, Wolfgang Bangerth, 1993-2001
*/
template<typename number>
-class FullMatrix : public vector2d<number>
+class FullMatrix : public Table<2,number>
{
public:
/**
inline
void FullMatrix<number>::fill (const number2* src)
{
- vector2d<number>::fill(src);
+ Table<2,number>::fill(src);
}
#include <algorithm>
template <typename number>
-FullMatrix<number>::FullMatrix (const unsigned int n) :
- vector2d<number> (n)
+FullMatrix<number>::FullMatrix (const unsigned int n)
+ :
+ Table<2,number> (n,n)
{}
template <typename number>
FullMatrix<number>::FullMatrix (const unsigned int m,
const unsigned int n) :
- vector2d<number> (m, n)
+ Table<2,number> (m, n)
{}
template <typename number>
FullMatrix<number>::FullMatrix (const unsigned int m,
- const unsigned int n,
- const number* entries) :
- vector2d<number> (m, n, entries)
-{}
+ const unsigned int n,
+ const number* entries)
+ :
+ Table<2,number> (m, n)
+{
+ this->fill (entries);
+}
template <typename number>
FullMatrix<number>::FullMatrix (const FullMatrix &m) :
- vector2d<number> (m)
+ Table<2,number> (m)
{}
FullMatrix<number>&
FullMatrix<number>::operator = (const FullMatrix<number>& M)
{
- vector2d<number>::operator=(M);
+ Table<2,number>::operator=(M);
return *this;
}
FullMatrix<number>&
FullMatrix<number>::operator = (const FullMatrix<number2>& M)
{
- vector2d<number>::operator=(M);
+ Table<2,number>::operator=(M);
return *this;
}
unsigned int
FullMatrix<number>::memory_consumption () const
{
- return sizeof(*this) - sizeof (vector2d<number>)
- + vector2d<number>::memory_consumption();
+ return sizeof(*this) - sizeof (Table<2,number>)
+ + Table<2,number>::memory_consumption();
};