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

Compare and negative for matrix

Browse Source
This commit is contained in:
Krad
2023-04-27 14:39:51 +08:00
parent e4e56b4a3e
commit 405963ad62
2 changed files with 184 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

167
src/Matrix.cpp
View File

@@ -515,6 +515,173 @@ namespace Aurora {
} }
} }
Matrix Matrix::operator>(double aScalar) const {
if (isComplex()) {
std::cerr << "Complex cann't compare!" << std::endl;
return Matrix();
}
Eigen::Map<Eigen::VectorXd> v(getData(), getDataSize());
double *ret = malloc(getDataSize());
Eigen::Map<Eigen::VectorXd> result(ret, getDataSize());
result.setConstant(0.0);
result = (v.array() > aScalar).select(1.0, result);
return New(ret, getDimSize(0), getDimSize(1), getDimSize(2));
}
Matrix operator>(double aScalar, const Matrix &matrix) {
if (matrix.isComplex()) {
std::cerr << "Complex cann't compare!" << std::endl;
return Matrix();
}
Eigen::Map<Eigen::VectorXd> v(matrix.getData(), matrix.getDataSize());
double *ret = malloc(matrix.getDataSize());
Eigen::Map<Eigen::VectorXd> result(ret, matrix.getDataSize());
result.setConstant(0.0);
result = (aScalar>v.array()).select(1.0, result);
return Matrix::New(ret, matrix.getDimSize(0), matrix.getDimSize(1), matrix.getDimSize(2));
}
Matrix Matrix::operator>(const Matrix &matrix) const {
if (isComplex() || matrix.isComplex()) {
std::cerr << "Complex cann't compare!" << std::endl;
return Matrix();
}
if (!compareShape(matrix) && !isScalar() && !matrix.isScalar()) {
std::cerr << "Matrix not equal, matrix 1(" << matrix.getDimSize(0) << "," << matrix.getDimSize(1) << ","
<< matrix.getDimSize(2) << "), matrix 2(" << getDimSize(0) << "," << getDimSize(1) << ","
<< getDimSize(2) << ")" << std::endl;
return Matrix();
}
if(isScalar()){
return getData()[0]>matrix;
}
if(matrix.isScalar()){
return (*this)>matrix.getData()[0];
}
Eigen::Map<Eigen::VectorXd> v(getData(), getDataSize());
Eigen::Map<Eigen::VectorXd> v2(matrix.getData(), matrix.getDataSize());
double *ret = malloc(matrix.getDataSize());
Eigen::Map<Eigen::VectorXd> result(ret, matrix.getDataSize());
result.setConstant(0.0);
result = (v.array() > v2.array()).select(1.0, result);
return Matrix::New(ret, matrix.getDimSize(0), matrix.getDimSize(1), matrix.getDimSize(2));
}
Matrix Matrix::operator<(double aScalar) const {
if (isComplex()) {
std::cerr << "Complex cann't compare!" << std::endl;
return Matrix();
}
Eigen::Map<Eigen::VectorXd> v(getData(), getDataSize());
double *ret = malloc(getDataSize());
Eigen::Map<Eigen::VectorXd> result(ret, getDataSize());
result.setConstant(0.0);
result = (v.array() < aScalar).select(1.0, result);
return New(ret, getDimSize(0), getDimSize(1), getDimSize(2));
}
Matrix operator<(double aScalar, const Matrix &matrix) {
if (matrix.isComplex()) {
std::cerr << "Complex cann't compare!" << std::endl;
return Matrix();
}
Eigen::Map<Eigen::VectorXd> v(matrix.getData(), matrix.getDataSize());
double *ret = malloc(matrix.getDataSize());
Eigen::Map<Eigen::VectorXd> result(ret, matrix.getDataSize());
result.setConstant(0.0);
result = (aScalar < v.array() ).select(1.0, result);
return Matrix::New(ret, matrix.getDimSize(0), matrix.getDimSize(1), matrix.getDimSize(2));
}
Matrix Matrix::operator<(const Matrix &matrix) const {
if (isComplex() || matrix.isComplex()) {
std::cerr << "Complex cann't compare!" << std::endl;
return Matrix();
}
if (!compareShape(matrix) && !isScalar() && !matrix.isScalar()) {
std::cerr << "Matrix not equal, matrix 1(" << matrix.getDimSize(0) << "," << matrix.getDimSize(1) << ","
<< matrix.getDimSize(2) << "), matrix 2(" << getDimSize(0) << "," << getDimSize(1) << ","
<< getDimSize(2) << ")" << std::endl;
return Matrix();
}
if(isScalar()){
return getData()[0]<matrix;
}
if(matrix.isScalar()){
return (*this)<matrix.getData()[0];
}
Eigen::Map<Eigen::VectorXd> v(getData(), getDataSize());
Eigen::Map<Eigen::VectorXd> v2(matrix.getData(), matrix.getDataSize());
double *ret = malloc(matrix.getDataSize());
Eigen::Map<Eigen::VectorXd> result(ret, matrix.getDataSize());
result.setConstant(0.0);
result = (v.array() < v2.array()).select(1.0, result);
return Matrix::New(ret, matrix.getDimSize(0), matrix.getDimSize(1), matrix.getDimSize(2));
}
Matrix Matrix::operator==(double aScalar) const {
if (isComplex()) {
std::cerr << "Complex cann't compare!" << std::endl;
return Matrix();
}
Eigen::Map<Eigen::VectorXd> v(getData(), getDataSize());
double *ret = malloc(getDataSize());
Eigen::Map<Eigen::VectorXd> result(ret, getDataSize());
result.setConstant(0.0);
result = (v.array() == aScalar).select(1.0, result);
return New(ret, getDimSize(0), getDimSize(1), getDimSize(2));
}
Matrix operator==(double aScalar, const Matrix &matrix) {
if (matrix.isComplex()) {
std::cerr << "Complex cann't compare!" << std::endl;
return Matrix();
}
Eigen::Map<Eigen::VectorXd> v(matrix.getData(), matrix.getDataSize());
double *ret = malloc(matrix.getDataSize());
Eigen::Map<Eigen::VectorXd> result(ret, matrix.getDataSize());
result.setConstant(0.0);
result = (aScalar == v.array() ).select(1.0, result);
return Matrix::New(ret, matrix.getDimSize(0), matrix.getDimSize(1), matrix.getDimSize(2));
}
Matrix Matrix::operator==(const Matrix &matrix) const {
if (isComplex() || matrix.isComplex()) {
std::cerr << "Complex cann't compare!" << std::endl;
return Matrix();
}
if (!compareShape(matrix) && !isScalar() && !matrix.isScalar()) {
std::cerr << "Matrix not equal, matrix 1(" << matrix.getDimSize(0) << "," << matrix.getDimSize(1) << ","
<< matrix.getDimSize(2) << "), matrix 2(" << getDimSize(0) << "," << getDimSize(1) << ","
<< getDimSize(2) << ")" << std::endl;
return Matrix();
}
if(isScalar()){
return getData()[0]==matrix;
}
if(matrix.isScalar()){
return (*this)==matrix.getData()[0];
}
Eigen::Map<Eigen::VectorXd> v(getData(), getDataSize());
Eigen::Map<Eigen::VectorXd> v2(matrix.getData(), matrix.getDataSize());
double *ret = malloc(matrix.getDataSize());
Eigen::Map<Eigen::VectorXd> result(ret, matrix.getDataSize());
result.setConstant(0.0);
result = (v.array() == v2.array()).select(1.0, result);
return Matrix::New(ret, matrix.getDimSize(0), matrix.getDimSize(1), matrix.getDimSize(2));
}
Matrix operator-(Matrix &&aMatrix) {
int size = aMatrix.getDataSize()*aMatrix.getValueType();
double zero = 0.0;
vdSubI(size,&zero,0,aMatrix.getData(),1,aMatrix.getData(),1);
return aMatrix;
}
Matrix operator-(const Matrix &aMatrix) {
return -(std::forward<Matrix&&>(aMatrix.deepCopy()));
}
Matrix::MatrixSlice::MatrixSlice(int aSize,int aStride, double* aData, ValueType aType, int aSliceMode,int aSize2, int aStride2): Matrix::MatrixSlice::MatrixSlice(int aSize,int aStride, double* aData, ValueType aType, int aSliceMode,int aSize2, int aStride2):
mSliceMode(aSliceMode),mData(aData), mSliceMode(aSliceMode),mData(aData),
mSize(aSize),mSize2(aSize2), mSize(aSize),mSize2(aSize2),

17
src/Matrix.h
View File

@@ -122,6 +122,10 @@ namespace Aurora {
Matrix operator-(Matrix &&matrix) const; Matrix operator-(Matrix &&matrix) const;
friend Matrix operator-(Matrix &&aMatrix,Matrix &aOther); friend Matrix operator-(Matrix &&aMatrix,Matrix &aOther);
//negetive
friend Matrix operator-(Matrix &&aMatrix);
friend Matrix operator-(const Matrix &aMatrix);
// mul // mul
Matrix operator*(double aScalar) const; Matrix operator*(double aScalar) const;
friend Matrix operator*(double aScalar, const Matrix &matrix); friend Matrix operator*(double aScalar, const Matrix &matrix);
@@ -144,6 +148,19 @@ namespace Aurora {
Matrix operator^(int times) const; Matrix operator^(int times) const;
friend Matrix operator^(Matrix &&matrix,int times); friend Matrix operator^(Matrix &&matrix,int times);
//compare
Matrix operator>(double aScalar) const;
friend Matrix operator>(double aScalar, const Matrix &matrix);
Matrix operator>(const Matrix &matrix) const;
Matrix operator<(double aScalar) const;
friend Matrix operator<(double aScalar, const Matrix &matrix);
Matrix operator<(const Matrix &matrix) const;
Matrix operator==(double aScalar) const;
friend Matrix operator==(double aScalar, const Matrix &matrix);
Matrix operator==(const Matrix &matrix) const;
/** /**
* print matrix , only support 2d matrix now * print matrix , only support 2d matrix now
*/ */