libraries/libmatricxx
1
0
Fork 0
Code Issues Pull Requests Releases Activity

stream any size of matrix

Browse Source
This commit is contained in:
Marc Wäckerlin
2016-08-23 13:58:31 +00:00
parent 740b210135
commit cf97d057ff
5 changed files with 97 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/makefile.am
View File

@@ -10,4 +10,8 @@
include_HEADERS = matrix.hxx
lib_LTLIBRARIES = libmatricxx.la
libmatricxx_la_SOURCES = version.cxx
MAINTAINERCLEANFILES = makefile.in

74
src/matrix.hxx
View File

@@ -52,13 +52,13 @@ namespace math {
template<typename TYPE, typename ARRAY=TYPE*> class MatrixBase {
//..............................................................constants
public:
//..............................................................variables
protected:
const size_t ROWS;
const size_t COLUMNS;
const size_t SIZE;
const size_t MEM_SIZE;
size_t ROWS;
size_t COLUMNS;
size_t SIZE;
size_t MEM_SIZE;
//...............................................................typedefs
public:
@@ -157,6 +157,14 @@ template<typename TYPE, typename ARRAY=TYPE*> class MatrixBase {
return ConstRowVector(*this, (TYPE*)_c+row*COLUMNS);
}
size_t rows() const {
return ROWS;
}
size_t columns() const {
return COLUMNS;
}
///}
/// @name operators
@@ -511,6 +519,19 @@ template<typename TYPE> class Matrix<TYPE, 0, 0>: public MatrixBase<TYPE> {
///@name special operations
///{
Matrix& resize(size_t rows, size_t columns) {
if (rows!=this->ROWS||columns!=this->COLUMNS) {
delete Parent::_c;
Parent::_c = new TYPE[rows*columns];
this->ROWS = rows;
this->COLUMNS = columns;
this->SIZE = rows*columns;
this->MEM_SIZE = sizeof(TYPE)*rows*columns;
}
memset(Parent::_c, 0, Parent::MEM_SIZE);
return *this;
}
Matrix& apply(std::function<void(TYPE&)> fn) {
Parent::apply(fn);
return *this;
@@ -661,9 +682,9 @@ template<typename TYPE, size_t ROWS, size_t COLUMNS>
template<typename TYPE, size_t ROWS, size_t COLUMNS>
std::ostream& operator<<(std::ostream& s, const Matrix<TYPE, ROWS, COLUMNS>& m) {
s<<'['<<ROWS<<'x'<<COLUMNS<<"]{";
for (size_t row = 0; row < m.ROWS; ++row) {
for (size_t column = 0; column < m.COLUMNS; ++column) {
s<<'['<<m.rows()<<'x'<<m.columns()<<"]{";
for (size_t row = 0; row < m.rows(); ++row) {
for (size_t column = 0; column < m.columns(); ++column) {
if (row!=0||column!=0) s<<',';
s<<m(row, column);
}
@@ -679,12 +700,37 @@ template<typename TYPE, size_t ROWS, size_t COLUMNS>
TYPE val(0);
std::string s;
if (!in.get(c) || c!='[') throw err;
if (!std::getline(in, s, 'x') || !(std::stringstream(s)>>sz) || sz!=m.ROWS) throw err;
if (!std::getline(in, s, ']') || !(std::stringstream(s)>>sz) || sz!=m.COLUMNS) throw err;
if (!std::getline(in, s, 'x') || !(std::stringstream(s)>>sz) || sz!=m.rows()) throw err;
if (!std::getline(in, s, ']') || !(std::stringstream(s)>>sz) || sz!=m.columns()) throw err;
if (!in.get(c) || c!='{') throw err;
for (size_t row = 0; row < m.ROWS; ++row) {
for (size_t column = 0; column < m.COLUMNS; ++column) {
if (row==m.ROWS-1&&column==m.COLUMNS) {
for (size_t row = 0; row < m.rows(); ++row) {
for (size_t column = 0; column < m.columns(); ++column) {
if (row==m.rows()-1&&column==m.columns()-1) {
if (!std::getline(in, s, '}') || !(std::stringstream(s)>>val)) throw err;
} else {
if (!std::getline(in, s, ',') || !(std::stringstream(s)>>val)) throw err;
}
m(row, column) = val;
}
}
return in;
}
template<typename TYPE>
std::istream& operator>>(std::istream& in, Matrix<TYPE, 0, 0>& m) {
std::ios_base::failure err("illegal matrix format");
char c(0);
size_t rows(0), columns(0);
TYPE val(0);
std::string s;
if (!in.get(c) || c!='[') throw err;
if (!std::getline(in, s, 'x') || !(std::stringstream(s)>>rows) || rows<=0) throw err;
if (!std::getline(in, s, ']') || !(std::stringstream(s)>>columns) || columns<=0) throw err;
m.resize(rows, columns);
if (!in.get(c) || c!='{') throw err;
for (size_t row = 0; row < m.rows(); ++row) {
for (size_t column = 0; column < m.columns(); ++column) {
if (row==m.rows()-1&&column==m.columns()-1) {
if (!std::getline(in, s, '}') || !(std::stringstream(s)>>val)) throw err;
} else {
if (!std::getline(in, s, ',') || !(std::stringstream(s)>>val)) throw err;