sunwen/Aurora
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix function by default value 1 in matrix mInfo .

Browse Source
This commit is contained in:
sunwen
2023-04-21 14:42:24 +08:00
parent a09a748051
commit 0c8e1e1038
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Function1D.cpp
View File

@@ -241,12 +241,7 @@ Matrix Aurora::repmat(const Matrix& aMatrix,int aRowTimes, int aColumnTimes)
int originalDataSize = aMatrix.getDataSize() * complexStep; int originalDataSize = aMatrix.getDataSize() * complexStep;
double* resultData = Aurora::malloc(originalDataSize * aRowTimes * aColumnTimes); double* resultData = Aurora::malloc(originalDataSize * aRowTimes * aColumnTimes);
int row = aMatrix.getDimSize(0); int row = aMatrix.getDimSize(0);
int column = 1; int column = aMatrix.getDimSize(1);
if(aMatrix.getDims() > 1)
{
column = aMatrix.getDimSize(1);
}
double* originalData = aMatrix.getData(); double* originalData = aMatrix.getData();
double* resultDataTemp = resultData; double* resultDataTemp = resultData;
for(int i=0; i<column; ++i) for(int i=0; i<column; ++i)
@@ -295,11 +290,7 @@ Matrix Aurora::repmat(const Matrix& aMatrix,int aRowTimes, int aColumnTimes, int
} }
std::vector<int> resultInfo; std::vector<int> resultInfo;
int row = resultTemp.getDimSize(0); int row = resultTemp.getDimSize(0);
int column = 1; int column = resultTemp.getDimSize(1);
if(resultTemp.getDims() > 1)
{
column = resultTemp.getDimSize(1);
}
resultInfo.push_back(row); resultInfo.push_back(row);
if (column > 1 || aSliceTimes > 1) if (column > 1 || aSliceTimes > 1)
{ {

6
src/Function2D.cpp
View File

@@ -3,6 +3,8 @@
#include "Function2D.h" #include "Function2D.h"
#include "mkl.h" #include "mkl.h"
using namespace Aurora;
double Aurora::immse(const Aurora::Matrix &aImageA, const Aurora::Matrix &aImageB) { double Aurora::immse(const Aurora::Matrix &aImageA, const Aurora::Matrix &aImageB) {
if (aImageA.getDims()!=2|| aImageB.getDims()!=2){ if (aImageA.getDims()!=2|| aImageB.getDims()!=2){
std::cerr<<"Fail!immse args must all 2d matrix!"; std::cerr<<"Fail!immse args must all 2d matrix!";
@@ -67,10 +69,6 @@ Aurora::Matrix Aurora::inv(Aurora::Matrix&& aMatrix) {
delete[] ipiv; delete[] ipiv;
return aMatrix; return aMatrix;
} }
#include "Function1D.h"
#include "Function.h"
using namespace Aurora;
Matrix Aurora::interp2(const Matrix& aX, const Matrix& aY, const Matrix& aV, const Matrix& aX1, const Matrix& aY1, InterpnMethod aMethod) Matrix Aurora::interp2(const Matrix& aX, const Matrix& aY, const Matrix& aV, const Matrix& aX1, const Matrix& aY1, InterpnMethod aMethod)
{ {

1
src/Matrix.cpp
View File

@@ -413,7 +413,6 @@ namespace Aurora {
void Matrix::printf() { void Matrix::printf() {
int k_count = getDimSize(2); int k_count = getDimSize(2);
int j_count = getDimSize(1); int j_count = getDimSize(1);
int complexstep = 1; int complexstep = 1;