From f5932c7b89ac13daa8ac3e1907b1f6bc02efb049 Mon Sep 17 00:00:00 2001 From: "dahyeong.kim" Date: Wed, 10 Apr 2013 11:36:26 +0900 Subject: [PATCH] [N_SE-33432] non-sqaure matrix is not set correctly Change-Id: I6f0acfb8e738cfe2c4e884fb25054f274fded380 Signed-off-by: dahyeong.kim --- src/base/FBaseDoubleMatrix.cpp | 8 ++++---- src/base/FBaseFloatMatrix.cpp | 8 ++++---- src/base/FBaseIntMatrix.cpp | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/base/FBaseDoubleMatrix.cpp b/src/base/FBaseDoubleMatrix.cpp index 1e03362..df65b25 100644 --- a/src/base/FBaseDoubleMatrix.cpp +++ b/src/base/FBaseDoubleMatrix.cpp @@ -73,7 +73,7 @@ DoubleMatrix::DoubleMatrix(int rowCount, int columnCount, const double* pArray, { for (int j = 0; j < __column; j++) { - __pMatrix[i][j] = pArray[i * __row + j]; + __pMatrix[i][j] = pArray[i * __column + j]; } } } @@ -83,7 +83,7 @@ DoubleMatrix::DoubleMatrix(int rowCount, int columnCount, const double* pArray, { for (int j = 0; j < __row; j++) { - __pMatrix[j][i] = pArray[i * __column + j]; + __pMatrix[j][i] = pArray[i * __row + j]; } } } @@ -813,7 +813,7 @@ DoubleMatrix::SetValue(const double* pArray, bool rowMajor) { for (int j = 0; j < __column; j++) { - __pMatrix[i][j] = pArray[i * __row + j]; + __pMatrix[i][j] = pArray[i * __column + j]; } } } @@ -823,7 +823,7 @@ DoubleMatrix::SetValue(const double* pArray, bool rowMajor) { for (int j = 0; j < __row; j++) { - __pMatrix[j][i] = pArray[i * __column + j]; + __pMatrix[j][i] = pArray[i * __row + j]; } } } diff --git a/src/base/FBaseFloatMatrix.cpp b/src/base/FBaseFloatMatrix.cpp index 0ba1c1c..c9f99e8 100644 --- a/src/base/FBaseFloatMatrix.cpp +++ b/src/base/FBaseFloatMatrix.cpp @@ -73,7 +73,7 @@ FloatMatrix::FloatMatrix(int rowCount, int columnCount, const float* pArray, boo { for (int j = 0; j < __column; j++) { - __pMatrix[i][j] = pArray[i * __row + j]; + __pMatrix[i][j] = pArray[i * __column + j]; } } } @@ -83,7 +83,7 @@ FloatMatrix::FloatMatrix(int rowCount, int columnCount, const float* pArray, boo { for (int j = 0; j < __row; j++) { - __pMatrix[j][i] = pArray[i * __column + j]; + __pMatrix[j][i] = pArray[i * __row + j]; } } } @@ -812,7 +812,7 @@ FloatMatrix::SetValue(const float* pArray, bool rowMajor) { for (int j = 0; j < __column; j++) { - __pMatrix[i][j] = pArray[i * __row + j]; + __pMatrix[i][j] = pArray[i * __column + j]; } } } @@ -822,7 +822,7 @@ FloatMatrix::SetValue(const float* pArray, bool rowMajor) { for (int j = 0; j < __row; j++) { - __pMatrix[j][i] = pArray[i * __column + j]; + __pMatrix[j][i] = pArray[i * __row + j]; } } } diff --git a/src/base/FBaseIntMatrix.cpp b/src/base/FBaseIntMatrix.cpp index 681f957..22a9b64 100644 --- a/src/base/FBaseIntMatrix.cpp +++ b/src/base/FBaseIntMatrix.cpp @@ -73,7 +73,7 @@ IntMatrix::IntMatrix(int rowCount, int columnCount, const int* pArray, bool rowM { for (int j = 0; j < __column; j++) { - __pMatrix[i][j] = pArray[i * __row + j]; + __pMatrix[i][j] = pArray[i * __column + j]; } } } @@ -83,7 +83,7 @@ IntMatrix::IntMatrix(int rowCount, int columnCount, const int* pArray, bool rowM { for (int j = 0; j < __row; j++) { - __pMatrix[j][i] = pArray[i * __column + j]; + __pMatrix[j][i] = pArray[i * __row + j]; } } } @@ -811,7 +811,7 @@ IntMatrix::SetValue(const int* pArray, bool rowMajor) { for (int j = 0; j < __column; j++) { - __pMatrix[i][j] = pArray[i * __row + j]; + __pMatrix[i][j] = pArray[i * __column + j]; } } } @@ -821,7 +821,7 @@ IntMatrix::SetValue(const int* pArray, bool rowMajor) { for (int j = 0; j < __row; j++) { - __pMatrix[j][i] = pArray[i * __column + j]; + __pMatrix[j][i] = pArray[i * __row + j]; } } } -- 2.7.4