From 0c8e1e1038d07b6745fb17d25349cf57ddefdb5b Mon Sep 17 00:00:00 2001
From: sunwen <sunwen@realcan.cn>
Date: Fri, 21 Apr 2023 14:42:24 +0800
Subject: [PATCH] Fix function by default value 1 in matrix mInfo  .

---
 src/Function1D.cpp | 13 ++-----------
 src/Function2D.cpp |  6 ++----
 src/Matrix.cpp     |  1 -
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/Function1D.cpp b/src/Function1D.cpp
index a41130f..8366b75 100644
--- a/src/Function1D.cpp
+++ b/src/Function1D.cpp
@@ -241,12 +241,7 @@ Matrix Aurora::repmat(const Matrix& aMatrix,int aRowTimes, int aColumnTimes)
     int originalDataSize = aMatrix.getDataSize() * complexStep;
     double* resultData = Aurora::malloc(originalDataSize * aRowTimes * aColumnTimes);
     int row = aMatrix.getDimSize(0);
-    int column = 1;
-    if(aMatrix.getDims() > 1)
-    {
-        column = aMatrix.getDimSize(1);
-    }
-
+    int column = aMatrix.getDimSize(1);
     double* originalData = aMatrix.getData();
     double* resultDataTemp = resultData;
     for(int i=0; i<column; ++i)
@@ -295,11 +290,7 @@ Matrix Aurora::repmat(const Matrix& aMatrix,int aRowTimes, int aColumnTimes, int
     }
     std::vector<int> resultInfo;
     int row = resultTemp.getDimSize(0);
-    int column = 1;
-    if(resultTemp.getDims() > 1)
-    {
-        column = resultTemp.getDimSize(1);
-    }
+    int column = resultTemp.getDimSize(1);
     resultInfo.push_back(row);
     if (column > 1 || aSliceTimes > 1)
     {
diff --git a/src/Function2D.cpp b/src/Function2D.cpp
index e0f7eea..e4872a5 100644
--- a/src/Function2D.cpp
+++ b/src/Function2D.cpp
@@ -3,6 +3,8 @@
 #include "Function2D.h"
 #include "mkl.h"
 
+using namespace Aurora;
+
 double Aurora::immse(const Aurora::Matrix &aImageA, const Aurora::Matrix &aImageB) {
     if (aImageA.getDims()!=2|| aImageB.getDims()!=2){
         std::cerr<<"Fail!immse args must all 2d matrix!";
@@ -67,10 +69,6 @@ Aurora::Matrix Aurora::inv(Aurora::Matrix&& aMatrix) {
     delete[] ipiv;
     return aMatrix;
 }
-#include "Function1D.h"
-#include "Function.h"
-
-using namespace Aurora;
 
 Matrix Aurora::interp2(const Matrix& aX, const Matrix& aY, const Matrix& aV, const Matrix& aX1, const Matrix& aY1, InterpnMethod aMethod)
 {
diff --git a/src/Matrix.cpp b/src/Matrix.cpp
index 12cc34e..9642a75 100644
--- a/src/Matrix.cpp
+++ b/src/Matrix.cpp
@@ -413,7 +413,6 @@ namespace Aurora {
 
 
     void Matrix::printf() {
-
         int k_count = getDimSize(2);
         int j_count = getDimSize(1);
         int complexstep = 1;