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

Add reshape and reshape's unittest.

Browse Source
This commit is contained in:
sunwen
2023-04-26 17:57:34 +08:00
parent abe69eb26d
commit 4f9b2ce392
3 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Function1D.cpp
View File

@@ -614,7 +614,6 @@ Matrix Aurora::intersect(const Matrix& aMatrix1, const Matrix& aMatrix2, Matrix&
iaResult[i] = j + 1; iaResult[i] = j + 1;
break; break;
} }
} }
} }
@@ -622,3 +621,12 @@ Matrix Aurora::intersect(const Matrix& aMatrix1, const Matrix& aMatrix2, Matrix&
return result; return result;
} }
Matrix Aurora::reshape(const Matrix& aMatrix, int aRows, int aColumns, int aSlices)
{
if(aMatrix.isNull() || (aMatrix.getDataSize() != aRows * aColumns * aSlices))
{
return Matrix();
}
return Matrix::copyFromRawData(aMatrix.getData(),aRows,aColumns,aSlices);
}

2
src/Function1D.h
View File

@@ -77,6 +77,8 @@ namespace Aurora {
Matrix auroraUnion(const Matrix& aMatrix1, const Matrix& aMatrix2); Matrix auroraUnion(const Matrix& aMatrix1, const Matrix& aMatrix2);
Matrix intersect(const Matrix& aMatrix1, const Matrix& aMatrix2); Matrix intersect(const Matrix& aMatrix1, const Matrix& aMatrix2);
Matrix reshape(const Matrix& aMatrix, int aRows, int aColumns, int aSlices);
/** /**
* 并集 * 并集
* @param aIa, [C,ia,~] = intersect(A,B)用法中ia的返回值 * @param aIa, [C,ia,~] = intersect(A,B)用法中ia的返回值

17
test/Function1D_Test.cpp
View File

@@ -476,3 +476,20 @@ TEST_F(Function1D_Test, intersect) {
EXPECT_DOUBLE_AE(ia.getData()[1],3); EXPECT_DOUBLE_AE(ia.getData()[1],3);
EXPECT_DOUBLE_AE(ia.getData()[2],9); EXPECT_DOUBLE_AE(ia.getData()[2],9);
} }
TEST_F(Function1D_Test, reshape) {
double* data = new double[9]{3,3,2,2,2,1,4,4,7};
auto matrix = Aurora::Matrix::fromRawData(data, 9,1,1);
auto result = Aurora::reshape(matrix,3,3,1);
EXPECT_DOUBLE_AE(result.getDimSize(0),3);
EXPECT_DOUBLE_AE(result.getDimSize(1),3);
EXPECT_DOUBLE_AE(result.getDimSize(2),1);
result = Aurora::reshape(matrix,3,1,3);
EXPECT_DOUBLE_AE(result.getDimSize(0),3);
EXPECT_DOUBLE_AE(result.getDimSize(1),1);
EXPECT_DOUBLE_AE(result.getDimSize(2),3);
result = Aurora::reshape(matrix,1,3,3);
EXPECT_DOUBLE_AE(result.getDimSize(0),1);
EXPECT_DOUBLE_AE(result.getDimSize(1),3);
EXPECT_DOUBLE_AE(result.getDimSize(2),3);
}