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

Merge branch 'master' of http://192.168.1.9:3000/Bug/Aurora

Browse Source
This commit is contained in:
sunwen
2023-05-12 16:30:18 +08:00
parent 40136b7ee9 17771a7c85
commit ff534dfd63
3 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -1,5 +1,5 @@
.idea/
cmake-build-debug/*
cmake-*/*
cmake-build-debug-wsl/*
build*/
.vscode/

7
src/Function2D.h
View File

@@ -148,6 +148,13 @@ namespace Aurora
Matrix dot(const Matrix &aMatrix, const Matrix &aOther, FunctionDirection direction = Column);
/**
* 转换下标为索引值
* @attention 索引值按照其实为1与matlab对应，在C++中使用需要-1
* @param aVMatrixSize
* @param aSliceIdxs
* @return
*/
Matrix sub2ind(const Matrix &aVMatrixSize, std::initializer_list<Matrix> aSliceIdxs);
};

38
src/Matrix.cpp
View File

@@ -915,23 +915,45 @@ namespace Aurora {
std::cerr <<"Assign value fail!Src data pointer is null!";
return *this;
}
if (matrix.getDims()!=mSliceMode) {
std::cerr <<"Assign value fail!Src matrix(dims count:"<< matrix.getDims() <<"), not match of des(dims count:"<<mSliceMode<<")!";
return *this;
switch (mSliceMode) {
case 2://matrix mode
{
if(matrix.getDims()!=2 || matrix.getDimSize(1)<=1)
{
std::cerr <<"Assign value fail!Src matrix(dims count:"<< matrix.getDims() <<"), not match of des(dims count:"<<mSliceMode<<")!";
return *this;
}
if (matrix.getDimSize(1)!=mSize2) {
std::cerr <<"Assign value fail!Src slice(dim 2 size:"<< matrix.getDimSize(1) <<"), not match of des(dim 2 size:"<<mSize2<<")!";
return *this;
}
break;
}
case 1:{
if(!matrix.isVector())
{
std::cerr <<"Assign value fail!Src matrix(dims count:"<< matrix.getDims() <<"), not match of des(dims count:"<<mSliceMode<<")!";
return *this;
}
break;
}
case 0:{
if(!matrix.isScalar()){
std::cerr <<"Assign value fail!Src matrix(dims count:"<< matrix.getDims() <<"), not match of des(dims count:"<<mSliceMode<<")!";
return *this;
}
}
}
if (matrix.getDimSize(0)!=mSize) {
std::cerr <<"Assign value fail!Src matrix(dim 1 size:"<< matrix.getDimSize(0)<<"), not match of des(dim 1 size:"<<mSize<<")!";
return *this;
}
if (matrix.getDimSize(1)!=mSize2) {
std::cerr <<"Assign value fail!Src slice(dim 2 size:"<< matrix.getDimSize(1) <<"), not match of des(dim 2 size:"<<mSize2<<")!";
return *this;
}
if (matrix.getValueType()!=mType) {
std::cerr <<"Assign value fail!Src slice(value type:"<< matrix.getValueType() <<"), not match of des(value type:"<<mType<<")!";
return *this;
}
switch (mSliceMode) {
//matrix mode
case 2:{
if (mType== Normal) {
cblas_dcopy_batch_strided(mSize, matrix.getData(), 1, matrix.getDimSize(0), mData, mStride,
@@ -943,6 +965,7 @@ namespace Aurora {
}
break;
}
//vector mode
case 1:{
if (mType== Normal){
cblas_dcopy(mSize,matrix.getData(),1,mData,mStride);
@@ -953,6 +976,7 @@ namespace Aurora {
}
break;
}
//scalar mode
case 0:
default:{
mData[0] = matrix.getData()[0];