# | Line 49 | Line 49 | |
---|---|---|
49 | #define MATH_SQUAREMATRIX_HPP | |
50 | ||
51 | #include "math/RectMatrix.hpp" | |
52 | + | #include "utils/NumericConstant.hpp" |
53 | ||
54 | namespace oopse { | |
55 | ||
# | Line 138 | Line 139 | namespace oopse { | |
139 | bool isSymmetric() const { | |
140 | for (unsigned int i = 0; i < Dim - 1; i++) | |
141 | for (unsigned int j = i; j < Dim; j++) | |
142 | < | if (fabs(this->data_[i][j] - this->data_[j][i]) > oopse::epsilon) |
142 | > | if (fabs(this->data_[i][j] - this->data_[j][i]) > epsilon) |
143 | return false; | |
144 | ||
145 | return true; | |
# | Line 157 | Line 158 | namespace oopse { | |
158 | bool isDiagonal() const { | |
159 | for (unsigned int i = 0; i < Dim ; i++) | |
160 | for (unsigned int j = 0; j < Dim; j++) | |
161 | < | if (i !=j && fabs(this->data_[i][j]) > oopse::epsilon) |
161 | > | if (i !=j && fabs(this->data_[i][j]) > epsilon) |
162 | return false; | |
163 | ||
164 | return true; | |
# | Line 169 | Line 170 | namespace oopse { | |
170 | return false; | |
171 | ||
172 | for (unsigned int i = 0; i < Dim ; i++) | |
173 | < | if (fabs(this->data_[i][i] - 1) > oopse::epsilon) |
173 | > | if (fabs(this->data_[i][i] - 1) > epsilon) |
174 | return false; | |
175 | ||
176 | return true; | |
# | Line 371 | Line 372 | namespace oopse { | |
372 | numPos++; | |
373 | } | |
374 | } | |
375 | < | // if ( numPos < ceil(double(n)/double(2.0)) ) |
375 | > | // if ( numPos < ceil(RealType(n)/RealType(2.0)) ) |
376 | if ( numPos < ceil_half_n) { | |
377 | for (i=0; i<n; i++) { | |
378 | v(i, j) *= -1.0; | |
# | Line 387 | Line 388 | namespace oopse { | |
388 | } | |
389 | ||
390 | ||
391 | + | typedef SquareMatrix<RealType, 6> Mat6x6d; |
392 | } | |
393 | #endif //MATH_SQUAREMATRIX_HPP | |
394 |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |