feat: rename sub_array_c -> sub_array_col

tiankaima · Jan 2, 2024 · d69915a · d69915a
1 parent 073e061
commit d69915a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/lib/HouseholderMethod/Bidiagonalization.cpp b/lib/HouseholderMethod/Bidiagonalization.cpp
@@ -18,7 +18,7 @@ Bidiagonalization_Result BidiagonalizationMethod(const Matrix &matrix) {
     auto V = Matrix::identity(n);
 
     for (ull k = 0; k < n; k++) {
-        auto x = A.sub_array_c(k, m, k);
+        auto x = A.sub_array_col(k, m, k);
         auto [v, beta] = HouseHolderMethod(x);
 
         auto P = Matrix::identity(m - k);
@@ -31,7 +31,7 @@ Bidiagonalization_Result BidiagonalizationMethod(const Matrix &matrix) {
         U = U * P_extended;
 
         if (k < n - 2) {
-            auto x = A.sub_array_r(k, k + 1, n);
+            auto x = A.sub_array_row(k, k + 1, n);
             auto [v, beta] = HouseHolderMethod(x);
 
             auto Q = Matrix::identity(n - k - 1);

diff --git a/lib/Matrix/Matrix.h b/lib/Matrix/Matrix.h
@@ -77,9 +77,9 @@ class Matrix {
     /// Return a sub-matrix of the matrix [start, end) x [start, end), both use index that start from 0
     [[nodiscard]] Matrix sub_matrix(ull start_row, ull end_row, ull start_col, ull end_col) const;
 
-    [[nodiscard]] Vector sub_array_r(ull row, ull start_col, ull end_col) const;
+    [[nodiscard]] Vector sub_array_row(ull row, ull start_col, ull end_col) const;
 
-    [[nodiscard]] Vector sub_array_c(ull start_row, ull end_row, ull col) const;
+    [[nodiscard]] Vector sub_array_col(ull start_row, ull end_row, ull col) const;
 
     /// Return only the diagonal elements of the matrix
     [[nodiscard]] Matrix sub_diagonal() const;
@@ -94,9 +94,9 @@ class Matrix {
     /// \warning this is often used in conjunction with sub_matrix()
     void set(ull start_row, ull end_row, ull start_col, ull end_col, const Matrix &other);
 
-    void set_r(ull row, ull start_col, ull end_col, const Vector &other);
+    void set_row(ull row, ull start_col, ull end_col, const Vector &other);
 
-    void set_c(ull start_row, ull end_row, ull col, const Vector &other);
+    void set_col(ull start_row, ull end_row, ull col, const Vector &other);
 
     /*
      * MatrixProperties:

diff --git a/lib/Matrix/MatrixSubOperations.cpp b/lib/Matrix/MatrixSubOperations.cpp
@@ -24,7 +24,7 @@ Matrix Matrix::sub_matrix(ull start_row, ull end_row, ull start_col, ull end_col
     return result;
 }
 
-[[nodiscard]] Vector Matrix::sub_array_r(ull row, ull start_col, ull end_col) const {
+[[nodiscard]] Vector Matrix::sub_array_row(ull row, ull start_col, ull end_col) const {
 #ifdef DEBUG
     if (end_col < start_col) {
         throw std::invalid_argument("Invalid sub_array size.");
@@ -42,7 +42,7 @@ Matrix Matrix::sub_matrix(ull start_row, ull end_row, ull start_col, ull end_col
     return result;
 }
 
-[[nodiscard]] Vector Matrix::sub_array_c(ull start_row, ull end_row, ull col) const {
+[[nodiscard]] Vector Matrix::sub_array_col(ull start_row, ull end_row, ull col) const {
 #ifdef DEBUG
     if (end_row < start_row) {
         throw std::invalid_argument("Invalid sub_array size.");
@@ -128,7 +128,7 @@ void Matrix::set(ull start_row, ull end_row, ull start_col, ull end_col, const M
     }
 }
 
-void Matrix::set_r(ull row, ull start_col, ull end_col, const Vector &other) {
+void Matrix::set_row(ull row, ull start_col, ull end_col, const Vector &other) {
 #ifdef DEBUG
     if (end_col < start_col) {
         throw std::invalid_argument("Invalid sub_array size.");
@@ -148,7 +148,7 @@ void Matrix::set_r(ull row, ull start_col, ull end_col, const Vector &other) {
     }
 }
 
-void Matrix::set_c(ull start_row, ull end_row, ull col, const Vector &other) {
+void Matrix::set_col(ull start_row, ull end_row, ull col, const Vector &other) {
 #ifdef DEBUG
     if (end_row < start_row) {
         throw std::invalid_argument("Invalid sub_array size.");