research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Numerics] Fix invalid memory access in DenseMatrix::mult

Browse source 
Results were incorrect for rectangular matrices
This commit is contained in:
Ray Speth 2016-04-09 00:18:34 -04:00
parent 155105c916
commit b94e272291
2 changed files with 48 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/numerics/DenseMatrix.cpp
View file

@ -87,7 +87,7 @@ void DenseMatrix::mult(const double* b, double* prod) const
{
ct_dgemv(ctlapack::ColMajor, ctlapack::NoTranspose,
static_cast<int>(nRows()),
static_cast<int>(nRows()), 1.0, ptrColumn(0),
static_cast<int>(nColumns()), 1.0, ptrColumn(0),
static_cast<int>(nRows()), b, 1, 0.0, prod, 1);
}

47
test/general/test_matrices.cpp
View file

@ -1,5 +1,6 @@
#include "gtest/gtest.h"
#include "cantera/numerics/BandMatrix.h"
#include "cantera/numerics/DenseMatrix.h"
using namespace Cantera;
@ -103,3 +104,49 @@ TEST_F(BandMatrixTest, checkRowsColumns) {
EXPECT_EQ((size_t) 0, i);
EXPECT_DOUBLE_EQ(1, s);
}
class DenseMatrixTest : public testing::Test
{
public:
DenseMatrixTest()
: x4{1,2,3,4}
, x3{3,2,1}
, b1{14, 32, 66, -34}
, b2{-6, 4, 26, 2}
, b3{14, 32, 66}
{
A1.resize(4, 4); // square
A2.resize(4, 3); // more rows
A3.resize(3, 4); // more columns
for (int i = 0; i < 3; i++) {
for (int j = 0; j < 3; j++) {
A1(i,j) = A2(i,j) = A3(i,j) = i*i + 2*j*j + i*j - 3;
}
A1(3,i) = A2(3,i) = pow(-1, i);
A1(i,3) = A3(i,3) = pow(2, i);
}
A1(3,3) = -9;
}
DenseMatrix A1, A2, A3;
vector_fp x4, x3;
vector_fp b1, b2, b3;
};
TEST_F(DenseMatrixTest, matrix_times_vector)
{
vector_fp c(4, 0.0);
A1.mult(x4.data(), c.data());
for (size_t i = 0; i < 4; i++) {
EXPECT_DOUBLE_EQ(b1[i], c[i]);
}
A2.mult(x3.data(), c.data());
for (size_t i = 0; i < 4; i++) {
EXPECT_DOUBLE_EQ(b2[i], c[i]);
}
A3.mult(x4.data(), c.data());
for (size_t i = 0; i < 3; i++) {
EXPECT_DOUBLE_EQ(b3[i], c[i]);
}
}