diff --git a/.gitignore b/.gitignore index 51fa643..46b1663 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ .idea/ -cmake-build-debug/* +cmake-*/* cmake-build-debug-wsl/* build*/ .vscode/ diff --git a/src/Function2D.h b/src/Function2D.h index 3a3bbec..1429e95 100644 --- a/src/Function2D.h +++ b/src/Function2D.h @@ -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 aSliceIdxs); }; diff --git a/src/Matrix.cpp b/src/Matrix.cpp index 4f43156..ea24216 100644 --- a/src/Matrix.cpp +++ b/src/Matrix.cpp @@ -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:"<