Merge commit 'e50c8eb9c89c7fc801ed2c543a1d3970011efb2c'
This commit is contained in:
commit
c3ba44d47a
@ -139,7 +139,7 @@ Matrix2 Matrix2::Identity(int size) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Matrix2 Matrix2::Diagonal(float f, int size) {
|
Matrix2 Matrix2::Diagonal(float f, int size) {
|
||||||
Matrix2 r = Matrix2(size, size);
|
Matrix2 r = Matrix2::Zero(size, size);
|
||||||
float* data = r.data;
|
float* data = r.data;
|
||||||
int valueIx = 0;
|
int valueIx = 0;
|
||||||
for (int ix = 0; ix < size; ix++) {
|
for (int ix = 0; ix < size; ix++) {
|
||||||
@ -206,16 +206,16 @@ Matrix2 LinearAlgebra::Matrix2::operator*(const Matrix2& B) const {
|
|||||||
int BColOffset = i * BCols; // BColOffset is constant for each row of B
|
int BColOffset = i * BCols; // BColOffset is constant for each row of B
|
||||||
for (int j = 0; j < BCols; ++j) {
|
for (int j = 0; j < BCols; ++j) {
|
||||||
float sum = 0;
|
float sum = 0;
|
||||||
// std::cout << " 0";
|
std::cout << " 0";
|
||||||
int BIndex = j;
|
int BIndex = j;
|
||||||
for (int k = 0; k < ACols; ++k) {
|
for (int k = 0; k < ACols; ++k) {
|
||||||
// std::cout << " + " << this->data[ARowOffset + k] << " * "
|
std::cout << " + " << this->data[ARowOffset + k] << " * "
|
||||||
// << B.data[BIndex];
|
<< B.data[BIndex];
|
||||||
sum += this->data[ARowOffset + k] * B.data[BIndex];
|
sum += this->data[ARowOffset + k] * B.data[BIndex];
|
||||||
BIndex += BCols;
|
BIndex += BCols;
|
||||||
}
|
}
|
||||||
r.data[BColOffset + j] = sum;
|
r.data[BColOffset + j] = sum;
|
||||||
// std::cout << " = " << sum << " ix: " << BColOffset + j << "\n";
|
std::cout << " = " << sum << " ix: " << BColOffset + j << "\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return r;
|
return r;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user