From 1f9f5fc82a2f056af629d1741d6fb53ccddbc10e Mon Sep 17 00:00:00 2001
From: kradchen <chenjuijun@realcan.cn>
Date: Fri, 12 May 2023 09:44:25 +0800
Subject: [PATCH] Fix matrix slice bug

---
 src/Matrix.cpp | 38 +++++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

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:"<<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];