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

Update removeDataFromArrays to pass unitTest.

Browse Source
This commit is contained in:
sunwen
2023-05-25 16:23:16 +08:00
parent f5302bf790
commit 663ad11e55
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/common/dataBlockCreation/removeDataFromArrays.cpp
View File

@@ -11,36 +11,36 @@ using namespace Aurora;
Aurora::Matrix Recon::removeDataFromArrays(const Aurora::Matrix& aOutPutMatrix, const Aurora::Matrix& aRemoveList)
{
// Matrix result = aOutPutMatrix;
// int minusNum = 0;
// for(int i=0; i<aRemoveList.getDataSize(); ++i)
Matrix result = aOutPutMatrix;
int minusNum = 0;
for(int i=0; i<aRemoveList.getDataSize(); ++i)
{
if(aRemoveList[i] == 0)
{
result = deleteColumn(result, i - minusNum);
++minusNum;
}
}
return result;
// size_t columnSize = sum(aRemoveList, FunctionDirection::All)[0];
// double* resultData = Aurora::malloc(columnSize * aOutPutMatrix.getDimSize(0));
// Matrix result = Matrix::New(resultData, aOutPutMatrix.getDimSize(0), columnSize);
// std::vector<std::pair<int,int>> copyList;
// size_t length = 0;
// for(size_t i=0; i<aRemoveList.getDataSize(); ++i)
// {
// if(aRemoveList[i] == 0)
// if(aRemoveList[i] == 1)
// {
// result = deleteColumn(result, i - minusNum);
// ++minusNum;
// ++length;
// }
// if(aRemoveList[i] == 0 && length != 0)
// {
// copyList.push_back({});
// length = 0;
// }
// }
// return result;
size_t columnSize = sum(aRemoveList, FunctionDirection::All)[0];
double* resultData = Aurora::malloc(columnSize * aOutPutMatrix.getDimSize(0));
Matrix result = Matrix::New(resultData, aOutPutMatrix.getDimSize(0), columnSize);
std::vector<std::pair<int,int>> copyList;
size_t length = 0;
for(size_t i=0; i<aRemoveList.getDataSize(); ++i)
{
if(aRemoveList[i] == 1)
{
++length;
}
if(aRemoveList[i] == 0 && length != 0)
{
copyList.push_back({});
length = 0;
}
}
}